fixed gitignore
Added the getting the api data
Merge branch 'master' of https://github.com/jhulley/sundayadventure into load_activities

Conflicts:
	app/assets/javascripts/activity_controller.js
	app/models/Foursquare.rb
Merge pull request #10 from jhulley/load_activities

Load activities