Making some tests
Merge branch 'master' of https://github.com/kdp8791/ImpressMe into api
Made changes to the scripts on their tutorial so they actually work
Merge branch 'master' of https://github.com/kdp8791/ImpressMe into api
Made the event controller and added a function for search to the event helper
Merge branch 'master' of https://github.com/kdp8791/ImpressMe into api
Merge branch 'master' of https://github.com/kdp8791/ImpressMe into api
Added an API call to the events controller to search for a predefined location and term
Removed useless junk
Merge branch 'master' of https://github.com/kdp8791/ImpressMe into api

Conflicts:
	app/app/controllers/events_controller.rb
	app/app/helpers/events_helper.rb
	app/app/views/events/index.html.erb