adding current changes
Merge branch 'master' of https://github.com/scott181182/TownHack2014

Conflicts:
	Unity/Main/Assets/Scripts/FlyPhysics.cs.meta
	Unity/Main/Assets/Standard Assets/Character Controllers/Sources/Scripts/PlantBite.cs
Revert "adding current changes"

This reverts commit 48d64b06af4359eeedc7ef5bedead8342b9703fa.

Conflicts:
	Unity/Main/Assets/Scripts/FlyPhysics.cs.meta
	Unity/Main/Assets/Standard Assets/Character Controllers/Sources/Scripts/PlantBite.cs
Merge branch 'master' of https://github.com/scott181182/TownHack2014

Conflicts:
	Unity/Main/Assets/Standard Assets/Character Controllers/Sources/Scripts/PlantBite.cs
Trying again