un peu de clean
Merge branch 'master' of https://github.com/dovotori/Index-threemap-2013

Conflicts:
	main.js
shit
Revert c439085..f2be8d9

This rolls back to commit c439085e1e9eb8a8228db416bf0cfed1f94f8a05.