Test commit
committing
changed readme
Merge branch 'master' of https://github.com/gazzhop/CollabCMS

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/workspace.xml
	README
Merge branch 'master' into feature-newcms

Conflicts:
	README