updates files
fixes issues
Merge branch 'master' of https://github.com/nathantross/project2
merged changes
Merge branch 'master' of https://github.com/nathantross/project2
resolves conflicts
fixes confclits
fixes conflicts
fixed heroku mismatch