new etape et api outpost.travel fonctionelle
my hands are typing words
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL
Màj Graphique hompage
add list of the journeys and the invitation received in /welcome
changement des redirections
Update graphique «forms»
Update graphique
haaaaannnnnnnnnnnnds
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL
Update front page
Merge branch 'master' of E:\Boulot\TELECOMNancy 2013\Hackathon\Hackathon2013IL with conflicts.
begin implementation of the webpage to handle a journey
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL

Conflicts:
	white-terra-413/templates/welcome.html
Update grapth 42
adventure.html display the list of the steps and all the suggestions for each step
background add
correct bug on front page
Merge branch 'master' of https://github.com/GuillaumeMante/Hackathon2013IL
Nice puce