updated info
Merge branch 'gh-pages' of github.com:ycpcs/ccsce2014-web into gh-pages