Initial commit
Merge branch 'master' of github.com:tuhin2006i/simple_cms

Conflicts:
	.gitignore