let s start
ok
Merge branch 'master' of https://github.com/Fireaxe/akuma

Conflicts:
	.gitignore
	README.md