Edit to index.php for pushj
Merge remote-tracking branch 'upstream/master'

Trying a merge with upstream/master
Merge pull request #1 from collabtest/master

Update index.php