first we commit

here
Merge branch 'branchtest'

this is a commit.# the commit.
Merge branch 'master' of https://github.com/catsbap/www

Conflicts:
	classes/Client.class.php
	common/common.inc.php
	ui/client-detail.php
	ui/clients.php