push from hp, test push - no changes
Merge branch 'master' of https://github.com/buys-fran/mymojo-adventure

Conflicts:
	clientprofile.php
	newclient.php