added non-working button
fixed button, added geolocation comparison
fixed git conflicts, committing button that links to geolocation and location comparison
Merge pull request #8 from jhulley/prelim_layout

Prelim layout
Removed tmp files from master
Added GemLock
Removed PRY
fixed geolocation and cookies functions on javascript
Merge branch 'master' into geo

Conflicts:
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/D0E/C80/sprockets%2F1450c8f5d2b6e201d72fa175586bbd97
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D4F/DA0/sprockets%2F91dfb1e3477659b982feeacb705e8073
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/D67/E70/sprockets%2F85c793a09648d9a2cc2001ea66ca1bee
	tmp/cache/assets/D87/AB0/sprockets%2F11e21eeefb4620da0d1b0055f808c7ce
	tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
Merge pull request #9 from jhulley/geo

fixed geolocation and cookies functions on javascript
Merge branch 'master' of https://github.com/jhulley/sundayadventure into load_activities

Conflicts:
	app/assets/javascripts/activity_controller.js
	app/models/Foursquare.rb