Initial Commit
Installed wordpress
Installed theme
Integration work
Deleted bonus themes
Merge branch 'master' of github.com:jamesacklin/caocpress

Conflicts:
	.gitignore