Obstacles

Added a working jump pad & fan
Merge branch 'Fysiktest' of https://github.com/alexdbaldwin/Superbowl3D into Fysiktest

Conflicts:
	Assets/Scenes/Prototype.unity
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0f/0f3979488f8abf148a58991c0ca5ccb1
	Library/metadata/a4/a43981d0b5eb2204fb0b4cdb1bb99fd0
	Library/metadata/e7/e72f09d82c61d1348a96d9bd14f67caa