Merge branch 'gh-pages' into working
Merge branch 'gh-pages'
Merge branch 'working'
Changed some HTML Code and CSS

Sept. 6, 2013
Merge branch 'master' into gh-pages