jea
Initial commit
Update README.md
Merge branch 'master' of https://github.com/robinsherwood/phpwcms-CP-templates.git
Merge branch 'master' of https://github.com/robinsherwood/phpwcms-CP-templates

Conflicts:
	README.md
Initial commit
Merge https://github.com/robinsherwood/phpwcms-website-templates

Conflicts:
	README.md