added bootstrap css framework
Merge branch 'master' of github.com:some-guys/beerly-ipa
added bootstrap-sass gem with various rails specific fixes
Merge branch 'master' of github.com:some-guys/beerly-ipa

Conflicts:
	app/models/location.rb
	db/schema.rb