Whoops.
Merge branch 'master' of https://github.com/codydaig/node-cms

Conflicts:
	README.md