hi
Merge branch 'Android-Game' of https://github.com/jfrense/Project_WinterGalaxy into Android-Game

Conflicts:
	.metadata/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/.i
ndexes/properties.index

.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/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.jdt.core/2328942654.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/0.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/6.png
	AndroidGalaxy/bin/AndroidGalaxy.apk
	AndroidGalaxy/bin/classes.dex
	AndroidGalaxy/bin/resources.ap_