Merge branch 'steven' into development
Merge remote-tracking branch 'origin/development' into Edwin
Merge branch 'steven' into development
Merge branch 'steven' into development
vector and weapon updates
Input handling logic, first implementation.

Using windows libs, needs to be optimised later when batman provide
code.
made base gameobject class abstract
Extended inheritance tree for game objects.
Resolving Merge Conflicts
Merge remote-tracking branch 'remotes/origin/Edwin' into steven

* remotes/origin/Edwin:
  Extended inheritance tree for game objects.
  made base gameobject class abstract
  Input handling logic, first implementation.
  vector and weapon updates

Conflicts:
	C#/LD31.csproj
	C++/GraphicsManager.cpp
Merge remote-tracking branch 'remotes/origin/Ash' into steven

* remotes/origin/Ash:

Conflicts:
	C++/GraphicsManager.cpp