Initial commit
Add .gitconfig
Merge branch 'master' of https://github.com/jchilders/mcmodder

Conflicts:
	.gitignore