switch to using bootstrap styling
Merge pull request #2 from tablexi/bootstrap

switch to using bootstrap styling
Merge branch 'master' into return-to-order-button-70227

Conflicts:
	app/assets/stylesheets/main.scss