changed paths for html
fixed path conflicts
created missing file
working on missing frameworks
fixed deletion of npm log
modified gitignore
solved readme issue
working with heroku
merge conflicts resolved
fixing heroku bugs
attempting to fix heroku dbKey issues
working with heroku dbKey issues
setting heroku env dbKey
Merge pull request #6 from pcs-cobrakai/dallasSummers

Dallas summers