Initial commit
initial commit
Merge branch 'master' of github.com:ZackMcBride/MultiMagic

Conflicts:
	LICENSE
	README.md