reformat code
lint css et html
fix merge
Merge branch 'master' of https://github.com/code-troopers/code-troopers.github.com

Conflicts:
	index.html