Merge branch 'master' of https://github.com/FortPinnsvin/Travel

Conflicts:
	src/templates/user.html
follow