first commit
Merge branch 'master' of github.com:HimaHimaBBS/himahima

Conflicts:
	.gitignore
	README.md