Commit to get last updates from coronation
Merge branch 'master' of https://github.com/Muini/cinequest

Conflicts:
	app/assets/stylesheets/application.css