some css changes
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp

Conflicts:
	app/assets/scss/main.scss
	build/css/main.css
	build/css/main.css.map
	build/index.html
Merge branch 'master' of https://github.com/TeamVegaCodefellows/MixologyApp