begin
start2
bones
Merge branch 'master' of github.com:newInventor/cms

Conflicts:
	index.php
added error class file