admins can create locations, users can view locations'
Merge pull request #3 from JohnBuonomo/admins-can-add-locations

Admins can add locations
Merge branch 'master' of github.com:JohnBuonomo/Field-Journal

Conflicts:
	app/views/users/show.html.erb
	config/routes.rb
rebase
creates entries table, users can create entries from dashboard
incorporates map that finds users location
entries are geocoded using ip address
users can view a list of their entries
users can view and link to entries from their profile or dashboard
clean up after rebase