New PC

Added Mods to git ignore
Merge branch 'master' into MapData

Conflicts:
	.gitignore
	.settings/org.eclipse.core.resources.prefs