init project
Merge branch 'master' of https://github.com/lc87624/otakuworld

Conflicts:
	.gitignore