Initial
Merge branch 'master' of github.com:oliyoung/cmngsoon

Conflicts:
	.gitignore