Initial Commit
Merge branch 'master' of https://github.com/aaron248-2008/merlin-core

Conflicts:
	.gitignore