multi-threading connection thing

gahhh
Merge branch 'multi_view'

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

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/3/100
03f68276800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/44/c0
9b3c01276800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/5/a05
6de82276800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/51/20
512580276800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/8c/e0
892bc8266800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/b1/60
5ff1e4256800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/d8/60
a21c11276800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.history/ed/70
97b145266800141618a8deb43f7f66

Android_App/.metadata/.plugins/org.eclipse.core.resources/.projects/Rift
Raff/.indexes/a0/d6/history.index

Android_App/.metadata/.plugins/org.eclipse.core.resources/.projects/Rift
Raff/.indexes/e4/81/96/c/history.index

Android_App/.metadata/.plugins/org.eclipse.core.resources/.projects/Rift
Raff/.indexes/properties.index

Android_App/.metadata/.plugins/org.eclipse.core.resources/.projects/Rift
Raff/.markers

Android_App/.metadata/.plugins/org.eclipse.core.resources/.safetable/org
.eclipse.core.resources

Android_App/.metadata/.plugins/org.eclipse.debug.core/.launches/RiftRaff
.launch
	Android_App/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Android_App/.metadata/.plugins/org.eclipse.jdt.core/3757334635.index

Android_App/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStam
ps

Android_App/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Android_App/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

Android_App/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContaine
rs.dat

Android_App/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHisto
ry.xml
	Android_App/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

Android_App/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.p
roperties
	Android_App/RiftRaff/bin/RiftRaff.apk
	Android_App/RiftRaff/bin/classes.dex
	Android_App/RiftRaff/bin/resources.ap_
	Android_App/RiftRaff/src/com/example/riftraff/MainActivity.java