Brief explanation of branching
Talking about merging in Git
Adding GitHub to tutorial
Import installation test scripts from boot-camps repo.
Fix typo.
Merge pull request #17 from douglatornell/typos

Fix typo.
Merge pull request #16 from douglatornell/setup-check

Import installation test scripts from boot-camps repo.
Fleshing out description of GitHub and adding discussion of licensing issues
Merge branch 'gh-pages' of github.com:swcarpentry/bc into gh-pages
Adding a CITATION file to the bootcamp template repository
Shortening title of Git tutorial
Merge remote-tracking branch 'swcarpentry/gh-pages' into gh-pages

* swcarpentry/gh-pages:
  Adding a note about countries to template files
  Starting to work on Git tutorial
  More instructions on bootcamp home page template.
  Putting note in index page explaining purpose.

Conflicts:
	index.html
Fix branch merge from 'swcarpentry/gh-pages' into gh-pages

* foo:
  Shortening title of Git tutorial
  Adding a CITATION file to the bootcamp template repository
  Fleshing out description of GitHub and adding discussion of licensing issues
  Fix typo.
  Import installation test scripts from boot-camps repo.
  Adding GitHub to tutorial
  Talking about merging in Git
  Brief explanation of branching

Conflicts:
	setup/bin/swc-installation-test-1.py
	setup/bin/swc-installation-test-2.py
Remove `make` from setup check script.
Make the use of the Anaconda Python distribution more explicit.
Use the non-Gui installer for Mac OS/X.
Add setup note about ensuring ubcsecure wireless network connectivity.
Update Mac OS/X git setup instructions w/ Katie Cunningham's words.
Add links from setup instructions pages back to bootcamp home page.
Add note about coffee and food to bootcamp home page.