1

1
Merge remote-tracking branch 'origin/master'

Conflicts:
	splash.html
	splash.php
Revert "1"

This reverts commit 7e8a60749a6045ede84e786545a59b74d5a416f2.
Merge branch 'master' of https://github.com/bregord/nearbuy