header & footer done
Merge branch 'master' of git://github.com/robinComa/SpaceApps_Tlse
clean up a bit!
Initial commit
Merge branch 'master' of github.com:SpaceAppsChallengeToulouse/My.Earth

Conflicts:
	README.md