Hello Melee
Merge branch 'master' of github.com:wayoutmind/melee

Conflicts:
	.gitignore
	LICENSE
	README.md