Noooo idea wtf these changes are.
Merge branch 'master' of https://github.com/sebrandon1/BLE-Project

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

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Momentum/.indexes/properties.index

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Momentum/.markers

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.proje
cts/Momentum/org.eclipse.jdt.core/state.dat

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.root/
.indexes/properties.index

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.root/
6.tree

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.safet
able/org.eclipse.core.resources

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.runtime/.setting
s/com.android.ide.eclipse.adt.prefs

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.runtime/.setting
s/org.eclipse.ui.ide.prefs

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.e4.workbench/workbenc
h.xmi

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/2039899325.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/2579147560.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/279601809.in
dex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/2986047919.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/3149754755.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/3944987423.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/3964086996.i
ndex

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/externalLibs
TimeStamps

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJ
arsCache

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNa
mes.txt

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/variablesAnd
Containers.dat

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.launching/.instal
l.xml

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.launching/library
Infos.xml

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.ui.workbench/dialog_s
ettings.xml

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.ui.workbench/workings
ets.xml

Momentum/AndroidApp/.metadata/.plugins/org.eclipse.wst.xml.core/system_c
atalog.xml
	Momentum/AndroidApp/Momentum/bin/Momentum.apk
	Momentum/AndroidApp/Momentum/bin/resources.ap_