my test commit 1
Merge branch 'master' of https://github.com/hatt-cms/cms

Conflicts:
	hatt-cms/index.php