Killing people works.
Merge branch 'WinstonBranch' of https://github.com/CptDefault/ggj2014

Conflicts:
	Unity/Assets/Scripts/GameSystem.cs
	Unity/Assets/Scripts/Player/Player.cs
Merge branch 'master' of https://github.com/CptDefault/ggj2014
Merge branch 'master' of https://github.com/CptDefault/ggj2014
Muzzle flash and particles in.
Level - Base Inside Wall inserted
Weapon flash tweaks and stuff.
Merge branch 'master' of https://github.com/CptDefault/ggj2014
Weapons in.
Merge branch 'master' of https://github.com/CptDefault/ggj2014

Conflicts:
	Unity/Assets/Scripts/Player/PlayerInput.cs
Level - More Environment Art
Merge branch 'master' of https://github.com/CptDefault/ggj2014
Bear Display
(Material needs to be coloured  will decide with hadleigh
DinosaurSkeleton
Merge branch 'master' of https://github.com/CptDefault/ggj2014
no message
Win conditions, misc.
Merge branch 'master' of https://github.com/CptDefault/ggj2014
Merge branch 'master' into WinstonBranch

Conflicts:
	Unity/Assets/Scripts/Game/GameSystem.cs
	Unity/Assets/Scripts/Player/PlayerInput.cs