updating git ignore
still working out the robot's reload
Merge branch 'master' of https://github.com/n8fern/Toy-Hell

Conflicts:
	RoboHooker/Assembly-UnityScript-vs.unityproj
	RoboHooker/Assembly-UnityScript.unityproj
	RoboHooker/Assets/Prefabs/Robot.prefab