Final project
Merge branch 'master' of https://github.com/mwmckee/eecs_398

Conflicts:
	app_code/Bicycle Bluetooth Diagnostics/src/com/bbdt/bluetoothbicyclediagnostics/activities/RidingHistoryActivity.java