revert
Merge branch 'master' of https://github.com/jfrense/Project_WinterGalaxy

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt