working on assignment 1
Merge branch 'gh-pages' of github.com:ycpcs/cs496-spring2014 into gh-pages