Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Level1.unity
	Assets/Scripts/Obstacles/ObstacleCache.cs

Merge remote-tracking branch
'origin/master'

Conflicts:
	Assets/Scenes/Level1.unity
	Assets/Scripts/Obstacles/ObstacleCache.cs

Merge
remote-tracking
branch
'origin/master'

Conflicts:
	Assets/Scenes/Level1.unity
	Assets/Scripts/Obstacles/ObstacleCache.cs

commented scripts
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Level1.unity
	Assets/Scripts/Obstacles/ObstacleCache.cs