Spikes/Fixed Prefabs/Added NGUI

spikes destroy player and have prefabs made, fixed ground prefabs to be
a single collision box, added new libary ngui
Merge branch 'master' into gerardo

Conflicts:
	Lords-of-Distortion/Assets/Scenes/prototype.unity
	Lords-of-Distortion/Library/CurrentLayout.dwlt
	Lords-of-Distortion/Library/CurrentMaximizeLayout.dwlt
	Lords-of-Distortion/Library/assetDatabase3
	Lords-of-Distortion/Library/guidmapper
	Lords-of-Distortion/Library/metadata/27/279e26fcf88ada64abaabe4923a62aeb
	Lords-of-Distortion/Library/metadata/60/60dad7b624397ab4c9569558501caf26
	Lords-of-Distortion/Library/metadata/73/73f621b9ca1cd44409d5e36bc9230331
	Lords-of-Distortion/Library/metadata/a9/a932be7970b4e024c85b08cd7e2e1ba5
	Lords-of-Distortion/Library/metadata/a9/a9522eec88882fb46ab1e0d27f0ef610
	Lords-of-Distortion/Library/metadata/cf/cf081044ec56b604aab567e6683b61e3
	Lords-of-Distortion/Library/metadata/ee/ee8e5e9e92d2db54785c5022344e8be0
	Lords-of-Distortion/Library/metadata/ff/ff8d1f89a564bc14a9e5d76c3f5a935f
updated gitignore