Added from Laptop
Merge branch 'newBranch' of https://github.com/brianwhelan/heroku
Added from Laptop
Merge branch 'master' of https://github.com/brianwhelan/heroku