[master] init
Merge branch 'master' of github.com:hell0again/mario

Conflicts:
	README.md