saving to move
Merge branch 'master' of github.com:JohnBuonomo/Field-Journal

Conflicts:
	app/views/users/show.html.erb
	config/routes.rb
users can associate with locations
Merge pull request #5 from JohnBuonomo/users-have-and-belong-to-many-locations

Users have and belong to many locations