First commit
Fixing master
Merge branch 'master' of https://github.com/lippoper/bob

Conflicts:
	index.php
	testclass.php