changed css file to scss
Merge branch 'master' of github.com:dankalmar/roombookingtool

Conflicts:
	app/assets/stylesheets/application.css.scss