Merge pull request swcarpentry#2 from swcarpentry/gh-pages

Catching up.
rgaiacs · May 12, 2016 · 630dddc · 630dddc
2 parents 2c8a33c + 986b989
commit 630dddc
Show file tree

Hide file tree

Showing 329 changed files with 12,445 additions and 26,737 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,4 @@
 *~
-*.bak
-*.html
-*.pyc
 .DS_Store
-.fontcustom-manifest.json
-.jekyll-metadata
 .sass-cache
-Gemfile.lock
 _site
diff --git a/01-introduction.md b/01-introduction.md
diff --git a/02-terms.md b/02-terms.md