Simple cms
Merge branch 'master' of github.com:jezemery/architect

Conflicts:
	README.md