resolved conflicts
Merge branch 'master' of https://github.com/mathur7/Project-2

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
google map fixed position and image uploading working on show page
Merge pull request #12 from tbuchanan/master

map working and images too