Merge branch 'master' of heroku.com:arcane-falls-2589

Conflicts:
	README.md
Merge branch 'master' of https://github.com/yutaono/heroku_phpinfo

Conflicts:
	README.md