added beginnings of alert boxes
Merge branch 'master' of github.com:fairwaymarket/reservations

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