Version 2.5
Merge branch 'gh-pages' of github.com:frank00125/wp2014s_final_project into gh-pages