consolidated files into test1
Merge branch 'master' of https://github.com/ocon60/heroku_test