Merge branch 'master' into chizi
Merge branch 'apelsin' into chizi
Merge branch 'apelsin' into chizi
deal with this later
temp commit; transferring to PC
Stage update

additional rough stage buildings and rough collider implemented
Added a pitch
Merge chizi
Also gitignore because what the heck
Merge branch 'apelsin' into chizi

Conflicts:
	Assets/gametest.unity
um yeah
Rhythm Game
Huge success
Still needs some work though