Misc. Fixes
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/LogFiles/RidesLog.txt