Merge branch 'gh-pages'
Merge pull request #1 from CSE512-14W/gh-pages

Want to merge
Merge branch 'master' of https://github.com/CSE512-14W/fp-ljorr1-jortiz16
Merge branch 'master' into gh-pages