initial commit

Signed-off-by: Dan Johnson <drj3141@gmail.com>
Merge branch 'master' of https://github.com/danjohnson3141/my_cms

Signed-off-by: Dan Johnson <drj3141@gmail.com>

Conflicts:
	.gitignore