Committing to be ready for merge.
Merge branch 'master' of https://github.com/alect/ECGBike

Conflicts:
	Assets/Scenes/PlayScene.unity
	Assets/Scripts/BikeController.cs
Go go goo, EKG BIKER!
Merge branch 'master' of https://github.com/alect/ECGBike