Version 0.16

Working Dino!!!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	SchoolPlatformer/Assets/Materials/dinosaurkindasheet.mat
	SchoolPlatformer/Assets/Prefabs/dinoprefab.prefab
	SchoolPlatformer/Library/ScriptAssemblies/Assembly-UnityScript.dll
	SchoolPlatformer/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	SchoolPlatformer/Library/metadata/40/40b516f1d3edf4942803f683f0f2609d
	SchoolPlatformer/Library/metadata/60/60345daace713f54cba16fb2ce8cb225
	SchoolPlatformer/Library/metadata/dd/dd819db5e6d22384ba075be6978398bb
	SchoolPlatformer/SchoolPlatformer-csharp.sln
	SchoolPlatformer/SchoolPlatformer.sln
	SchoolPlatformer/SchoolPlatformer.userprefs