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

Conflicts:
	beerly.xcodeproj/project.pbxproj