And More python
Merge branch 'master' of github.com:HBQ15/code

Conflicts:
	programming/Java/Android/.metadata/.log
	programming/Java/Android/.metadata/.plugins/org.eclipse.cdt.core/.log
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.jdt.core.external.folders/.location
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/Jarvis/.indexes/50/history.index
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/Jarvis/.indexes/7/26/history.index
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/Jarvis/.indexes/properties.index
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.projects/Jarvis/.markers
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	programming/Java/Android/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	programming/Java/Android/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	programming/Java/Android/.metadata/.plugins/org.eclipse.jdt.core/1114729825.index
	programming/Java/Android/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	programming/Java/Android/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	programming/Java/Android/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	programming/Java/Android/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	programming/Java/Android/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	programming/Java/Android/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	programming/Java/Android/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	programming/Java/Android/.metadata/.plugins/org.eclipse.wst.xml.core/system_catalog.xml