end of class
Merge branch 'gh-pages'
Did some CSS