Added Travis CI and automatic deployment to Heroku
Merge branch 'master' into dev

Conflicts:
	config/database.yml
generated controllers and views
Added secret token to repo
Merge branch 'dev' of github.com:csci602/event-finder into dev
Merge branch 'dev' into CLAYDEV
Merge branch 'master' into dev
Merge branch 'dev' of https://github.com/csci602/event-finder into dev
Merge branch 'dev' into CLAYDEV
Added basic views, routes, and controllers (Kathy and Clay)
Merge branch 'dev'