preparing for heroku.
Remove HEAD>>>>>>>
Merge branch 'gh-pages' of github.com:CoderDojoNYC/NYCsalt into php

Conflicts:
	index.php
removed index.php