first we commit

here
Merge pull request #2 from littleberry/master

Create README.md
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
not sure what I'm doing, but this seems cool
not sure what I'm doing, but this seems cool
not sure what I'm doing, but this seems cool
Merge pull request #3 from littleberry/master

Updates to client-add.html, styles.css, added client-controls.js
testing hook
seeing if this hook will work.
Merge pull request #4 from littleberry/master

style updates
time_tracker, I am lost
time_tracker
testing the git update
testing the git update again
Merge pull request #5 from littleberry/master

style updates for client-add form
testing the git update
bgb