Resolved merge conflicts, updated config for Tulane migration

Author: Deepakgthomas

.gitignore

@@ -0,0 +1,9 @@
+/.idea/
+/_site
+/.sass-cache
+/.jekyll-metadata
+/Gemfile.lock
+/.bundle
+/vendor
+.DS_Store
+*~

.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+rvm:
+- 2.4.2
+script: "./_scripts/cibuild"
+env:
+  global:
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    secure: hMs/MC74mITE29JFQLj8gVgb5ZoaTUQ8lteFXPqkA2OljTXAzcApvM4Dq46VMIuCsDa+mb8CqFHBXL/y/l13j5wvZJ2IF7XmMKiUDfMBKK733XH0slvAhBKlY7VR0tseFp6KSXPsj9cxwv410re1sJqWoPRV4fjKxYSfvfP0P9VwrGLqfMuL+zPQLkkOx1bR8xcylPX9dPB02t2/LvAmXCG0vLMEmiee7HQmkzey2VZaMpiZqq4sXCYKe91DNyAUkmuDLK4v/cZR6NnqsqGugJ721TdHzsjM9cqWSQCdYtRrLemhrN8Kkb4TYaZZ3pu9BqAHs5gcQfAexneV5tuZ+fNFO8Tco/Q1cRzipqa9mkSLRvpjMkiE4OQECAT1+dOijTDrTmZQFMB79yZhevYPF/HfCx+pGpf+AaWRAGHD+BhHqdeDKOOCAbT9QF7h5nTHLuncaO/vKYAidqBVDYB5Bjh3LswUhhzjWIvue+Hl0zYyObmyMYeHoYLBTnT2ncY+RDY1UNNUxz1fszSimT7KeGbkEsHrXvCJ6tf7OkCDunrik9/OyKTyBoKLpervu8WWypY7CbMDmi314QJgxOdT8r8kclnhDSY0Mw7y552sRteFAF6Vvza7WfPE2hTv26Zh1XzK78lRTRJgekGO1/hVtFbKuv3jcYAARcHmBUeLMVM=
+sudo: false
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN
+  repo: lab-design/lab-design.github.io
+  target_branch: master
+  local_dir: _site
+  on:
+    branch: master

Gemfile

@@ -1,3 +1,4 @@
+# Open Gemfile in your preferred editor and replace the content with:
 source "https://rubygems.org"
 
 # Hello! This is where you manage which Jekyll version is used to run.

_config.yml

@@ -14,11 +14,11 @@
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 title: Laboratory for Software Design
-email: hridesh@iastate.edu
+email: hrajan@tulane.edu  # Updated to Tulane email
 description: >
   TODO
 baseurl: "" # the subpath of your site, e.g. /blog
-url: "https://lab-design.github.io/"
+url: "https://lab-design.github.io/"  # Keep the GitHub Pages URL
 
 # Build settings
 markdown: kramdown
@@ -30,7 +30,6 @@ exclude:
   - _citation_styles
   - README.md
 
-
 collections:
   papers:  # Declare the `papers` collection, and output a page for every item.
     output: true
@@ -53,7 +52,8 @@ static_files:
 
 scholar:
   source: .
-# Plugins
+
+# Plugins (using the modern approach instead of 'gems')
 plugins:
   - jekyll-paginate
   - jekyll-scholar