Almost done
Merge branch 'master' of github.com:nobpo/tour

Conflicts:
	app/routes.php
	app/views/index.php
	public/css/style.css