removed things
Merge branch 'master' of https://github.com/jbcon/Robot

Conflicts:
	Robot/Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab
	Robot/Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	Robot/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials/constructor_done.mat