change content order
better transit info
Merge branch 'master' of github.com:andreivolt/simplon.co

Conflicts:
	views/summercamp.haml