Added style.css
Merge branch 'master' of https://github.com/fairwaymarket/reservations

Conflicts:
	public/assets/styles/style.scss
Merge branch 'master' of https://github.com/fairwaymarket/reservations