hey, it still works. still horrible, hahaha. i'll make it less awful.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.html

	also, we'll enable jsp love here. the .html bastard i'll go out to buy
some cigar and will never ever come back.