changed git ignore
added .config
 added procfile
fixing heroku
trying to work with heroku
added config file
added config back to ignore
Merge branch 'master' of https://github.com/PCS-Javascript-Junkies/Capstone-Project
 further work on google maps api. Having an error with the async call
 fixed google map on the result page
fix merge conflicts
Merge pull request #31 from PCS-Javascript-Junkies/crouseMatthew

Crouse matthew
merge master, fix conflict in dbmain