First deploy
Added index.php
Update
Deploy files
Merge remote-tracking branch 'origin/master'
Merge with GitHub repo
Fix app initialization
Merge remote-tracking branch 'heroku/master'

Conflicts:
	index.php