init project
Merge branch 'master' of https://github.com/hungtrinh/cms

Conflicts:
	.gitignore