comit 2
Merge branch 'master' of https://github.com/hendrax/CRUD-OOP

Conflicts:
	test.php
comit 3