Namespaced styles
Removed superfluous event
Added event descriptions
Merge branch 'master' into bathstudent

Conflicts:
	css/style.css
	index.html