work
Merge branch 'master' of https://github.com/marksomnian/milkcraft into dev

Conflicts:
	.gitignore
Merge pull request #4 from marksomnian/dev

Dev