meh
Merge branch 'master' of happinessforme.com:html5ks

Conflicts:
	Makefile
stuff