stuff
Merge branch 'gh-pages' of github.com:ycpcs/cs340-fall2014 into gh-pages