Trigger prefabs added
Merge remote-tracking branch 'origin/NormanBranch' into TimBranch

Conflicts:
	Assets/test.unity
Movement tweaks

Capped speed. Added jumping with double jump prevention.

Converted player to prefab
Removed son files from repo