Added "all" the features

Fear and tensions updates from traps.
Traps dynamic that can now pull their data from a database
Trap button added to HUD with a cooldown timer
???????

Git, you vile fiend you.
Merge branch 'master' of https://github.com/swindeler/MethodsGame

Conflicts:
1jcbcdk2.egj.txt
Spooks/Assembly-CSharp-vs.csproj
Spooks/Assembly-CSharp.csproj
Spooks/Assembly-UnityScript-vs.unityproj
Spooks/Assembly-UnityScript.unityproj
Spooks/Assets/FearAndTension.cs
Spooks/Assets/FearAndTension.cs.meta
Spooks/Assets/FearAndTension.cs.meta~HEAD
Spooks/Assets/FearAndTension.cs.meta~HEAD.meta
Spooks/Assets/Ghost.blend.blend
Spooks/Assets/Ghost.blend.blend.meta
Spooks/Assets/Materials/Material_001.mat
Spooks/Assets/Materials/Material_001.mat.meta
Spooks/Assets/Materials/RED 1.mat
Spooks/Assets/Materials/RED 1.mat.meta
Spooks/Assets/PlayerHealth.cs
Spooks/Assets/PlayerHealth.cs.meta
Spooks/Assets/PlayerOverlay.cs
Spooks/Assets/RunDudeRun.unity
Spooks/Assets/Traps.cs
Spooks/Library/CurrentLayout.dwlt
Spooks/Library/ScriptAssemblies/Assembly-CSharp.dll
Spooks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
Spooks/Library/assetDatabase3
Spooks/Library/expandedItems
Spooks/Library/guidmapper
Spooks/Library/metadata/07/075c6a6d3e87df44ebc9db313a2052e7
Spooks/Library/metadata/17/177ceeff4dcd1c346a766a503ad785ab
Spooks/Library/metadata/33/33277b3c22128e2448f701bf886d567f
Spooks/Library/metadata/56/56c286746a14ca74ab9c0e9810f51eab
Spooks/Library/metadata/59/59c32c0c6096b5f49baad39d080bc737
Spooks/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
Spooks/Library/metadata/92/92ab14d90c224774c824b673fde9b28e
Spooks/Library/metadata/9f/9f9c332200bb4ac42bbe679a172f7a14
Spooks/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8
Spooks/Library/metadata/f6/f6fb676a5b409b7478cf93f80c1ed868
Spooks/Spooks-csharp.sln
Spooks/Spooks.sln
Spooks/Spooks.userprefs
seriously annoyed