clean up
Merge branch 'master' of github.com:qkdreyer/codinweek1
Fixes
Added Heroku Conf File