some clarification
Merge branch 'master' of github.com:SleepingInsomniac/DataBaser

Conflicts:
	model.class.php
Merge branch 'master' of github.com:SleepingInsomniac/DataBaser

Conflicts:
	model.class.php