Fix ugly Christian style indenting
Merge branch 'master' of https://github.com/FlamingoApp/flamingoapp.github.com

Conflicts:
	index.html