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