new file:   Assets/Prefabs/BOX.prefab
	new file:   Assets/Prefabs/BOX.prefab.meta
	modified:   Assets/Prefabs/Obstacle.prefab
	new file:   Assets/Prefabs/PIPE.prefab
	new file:   Assets/Prefabs/PIPE.prefab.meta
	new file:   Assets/Prefabs/RAMP.prefab
	new file:   Assets/Prefabs/RAMP.prefab.meta
	new file:   Assets/Prefabs/SAW.prefab
	new file:   Assets/Prefabs/SAW.prefab.meta
	new file:   Assets/Prefabs/TRASHCAN.prefab
	new file:   Assets/Prefabs/TRASHCAN.prefab.meta
	modified:   Assets/Scenes/Level_1.unity
	modified:   Assets/Scripts/GenerateObstacles.js
Merge branch 'master' of https://github.com/OminStyle/IamAgamer

Conflicts:
	Assets/Prefabs/Obstacle.prefab
	Assets/Scenes/Level_1.unity