Updating setup instructions
Merge branch 'gh-pages' of github.com:jennybc/2014-05-12-ubc into gh-pages
Merge pull request #2 from gvwilson/gh-pages

Updating setup instructions