Gitignore
Merge branch 'master' of https://github.com/MinestrapTeam/Minestrappolation-2

Conflicts:
	.gitignore