add database.yml to git ignore
Merge branch 'master' of https://github.com/jackjeffress/activityfinder
fix gitignore conflict