Generated location model
Merge branch 'master' of github.com:some-guys/beerly-ipa

Conflicts:
	Gemfile
Reorganized gemfile