hello!!!!!!!!!!
Merge branch 'master' of https://github.com/hotpot0525/Sakikaja

Conflicts:
	README