Truthiness
Merge remote-tracking branch 'origin/stylishBoots' into stylishBoots

Conflicts:
	index.html
Indentation and stuff