Right here and now and now!
Merge branch 'master' of https://github.com/mattcoady/class

Conflicts:
	index.html