first commit
Merge branch 'master' of github.com:Tuxii/shmupwac

Conflicts:
	README.md