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

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log

.metadata/.plugins/org.eclipse.core.resources/.projects/AndroidGalaxy/.i
ndexes/e4/81/96/c1/history.index

.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/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/.projects/Galaxy
Defender/org.eclipse.jdt.core/state.dat

.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.
index
	.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.core.runtime/.settings/org.eclipse.debug.
ui.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.la
unching.prefs

.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui
.prefs

.metadata/.plugins/org.eclipse.debug.core/.launches/AndroidGalaxy.launch
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/484331168.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	AndroidGalaxy/bin/AndroidGalaxy.apk
	AndroidGalaxy/bin/resources.ap_