Merge pull request #29 from PCS-Javascript-Junkies/crouseMatthew

Crouse matthew
Merge pull request #30 from PCS-Javascript-Junkies/crouseMatthew

Crouse matthew
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
fix merge conflicts