Merge pull request #10 from tbuchanan/master

geo loc working with pins... kinda
stuff
doing this again
formatted ajax, date still needs to be fixed
merged css changes
Removing tmp files
Removing log
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