touch readme
added php for heroku build
removed everything
Merge branch 'master' into HEAD
Merge branch 'develop/master' into github/master
Merge branch 'github/master'