Commit 07 : 49 PM - 12/04/2014

Bug fixes
New Water
Scoring system with limb collider
score screen added
added control images
lots of things
Merge remote-tracking branch 'origin/master'

Conflicts:
	Prison Air/Assets/Scenes/Level1.unity
	Prison Air/Assets/Scenes/ScoreScreen.unity
	Prison Air/Assets/Scripts/AnimatingTest.cs
	Prison Air/Assets/Scripts/CatapultArm.cs
	Prison Air/Assets/Scripts/Cop.cs
	Prison Air/Assets/Scripts/Criminal.cs
	Prison Air/Assets/Scripts/LimbCollider.cs
	Prison Air/Assets/Scripts/PrisonAudio.cs
	Prison Air/Assets/Scripts/PrisonObstacle.cs
	Prison Air/Assets/Scripts/ScoreScreen.cs
	Prison Air/Library/CurrentLayout.dwlt
	Prison Air/Library/CurrentMaximizeLayout.dwlt
	Prison Air/Library/EditorUserBuildSettings.asset
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp.dll
	Prison Air/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Prison Air/Library/assetDatabase3
	Prison Air/Library/expandedItems
	Prison Air/Library/guidmapper
	Prison Air/Library/metadata/0c/0c23bacb8e9f9ae42b458c5f2b7e0d4c
	Prison Air/Library/metadata/11/1191bc7435209ce44b7a5c05e4a8d5ee
	Prison Air/Library/metadata/18/18aa84b3fcfb39541a8e164efceec5de
	Prison Air/Library/metadata/30/30cb6ab9e9fa80c46a130714d93f7712
	Prison Air/Library/metadata/53/530007dd58728354daf8d61df2bad443
	Prison Air/Library/metadata/5f/5f63fd535aa64734fbc39aa9c6679f8d
	Prison Air/Library/metadata/aa/aa03bd6c907ae8b4fa424cda9c508024
	Prison Air/Library/metadata/c9/c947f0831699d7248b265d72a9468bce
	Prison Air/Library/metadata/cc/ccb5c8be9b821fc4ca63a0f2e6d0593f
	Prison Air/Library/metadata/e9/e93c001a760f8974591bb76e523d6d3c
	Prison Air/Library/shadercompiler-1.log
	Prison Air/Prison Air.userprefs
	Prison Air/ProjectSettings/TagManager.asset