application tour

Conflicts:

	app/assets/javascripts/app-tour.js
	app/assets/stylesheets/pages.css.scss
	app/views/pages/home.html.haml