Commit added another class
Changed a word
Merge branch 'gh-pages'

Conflicts:
	index.html