init
Merge branch 'master' of github.com:eternnoir/MarkDM

Conflicts:
	.gitignore
	LICENSE