initial commit
Merge github.com:brad-techguy/railscms

Conflicts:
	.gitignore