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

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
trying to sync
sync
Merge branch 'master' of https://github.com/jfrense/Project_WinterGalaxy

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/.m
arkers

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/.m
arkers.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/.s
yncinfo.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/or
g.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Galaxy
Defender/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Galaxy
Defender/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/Galaxy
Defender/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/3784982869.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	Galaxy Defender/bin/View/EnemyView.class