26052014-0

Fixed : #20, #21
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/LogFiles/RidesLog.txt
	BikeChallengeApp/index.html