31053014-4
Merge branch 'master' of https://github.com/naorbo/BikeChallange

Conflicts:
	BikeChallengeApp/index.html
	BikeChallengeApp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache