no changes done
metadata log
Merge branch 'master' of https://github.com/attoken/TeamDauntless

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.cdt.core/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location
	.metadata/.plugins/org.eclipse.core.resources/.projects/Le'Family API/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Le'Family API/org.eclipse.egit.core/GitProjectData.properties
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/a0/5f/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/e4/81/f7/e7/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/org.eclipse.egit.core/GitProjectData.properties
	.metadata/.plugins/org.eclipse.core.resources/.projects/Project/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/org.eclipse.egit.core/GitProjectData.properties
	.metadata/.plugins/org.eclipse.core.resources/.projects/TestAndroidToPHP/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/50/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/7/26/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/11/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/30/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/32/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/4a/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/62/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/d6/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/de/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/a0/eb/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.egit.core/GitProjectData.properties
	.metadata/.plugins/org.eclipse.core.resources/.projects/appcompat_v7/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/test/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/test/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.projects/test/org.eclipse.egit.core/GitProjectData.properties
	.metadata/.plugins/org.eclipse.core.resources/.projects/test/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.ddms.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/449384428.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.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.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.wst.sse.core/task-tags.properties
	.metadata/version.ini
	Project/bin/Project.apk
	Project/bin/classes.dex
	Project/bin/dexedLibs/android-support-v4-fcc095918752bccb9751c48f443861d5.jar
	Project/bin/dexedLibs/android-support-v7-appcompat-756663b44abff641e9d077a2e5d8ee24.jar
	Project/bin/dexedLibs/android-support-v7-appcompat-af972065ac15458aaf9838ebd71dcdb8.jar
	Project/bin/dexedLibs/appcompat_v7-a9432978f716c4cd6243daab93ebac06.jar
	Project/bin/resources.ap_
	TestAndroidToPHP/.classpath
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$anim.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$attr.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$bool.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$color.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$dimen.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$drawable.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$id.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$integer.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$layout.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$string.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$style.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R$styleable.class
	TestAndroidToPHP/bin/classes/android/support/v7/appcompat/R.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/MainActivity$MyTask.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/MainActivity.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$anim.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$attr.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$bool.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$color.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$dimen.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$drawable.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$id.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$integer.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$layout.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$menu.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$string.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$style.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R$styleable.class
	TestAndroidToPHP/bin/classes/com/example/testandroidtophp/R.class
	appcompat_v7/bin/appcompat_v7.jar