Merge branch 'Michael-Swedo' into Evaluations
Merge branch 'Michael-Swedo' into Evaluations
Merge from jon
More Input Improvements
Rhythm Section "Finished"
Merge branch 'Michael-Swedo'

Conflicts:
	Assets/Prefabs/Rhythm/Note - Double.prefab
	Assets/Prefabs/Rhythm/Note - Single.prefab
	Assets/Prefabs/Rhythm/Text - Modifier.prefab
	Assets/Scenes/Rhythm Section.unity
	Assets/Scripts/Jonathan Cabe/ResizeCollider.cs
	Assets/Scripts/Jonathan Cabe/RhythmGame.cs
	Assets/Scripts/Jonathan Cabe/RhythmNote.cs
Fixed script conflicts.
Fixes
Merge branch 'master' into Michael-Swedo