New settings being saved.
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/.projects/Momentum/.indexes/properties.index
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.projects/Momentum/.markers
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.projects/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/3.tree
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.runtime/.settings/com.android.ide.eclipse.adt.prefs
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/2986047919.index
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/3443309332.index
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	Momentum/AndroidApp/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml