my prototype
added the bitmap folder again to prototype
Merge branch 'prototype' of github.com:jappeace/hw-isgp-kbs into prototype

Conflicts:
	bitmap/bitmap/bitmap.cpp
df
C

C
D
C
D
C
C
D
D
D
C
C
C
C
C
C
C
C
C
C
C
C
C
C
B
B
Added the BehaviourInterface to base the gravity on.
Moved the behaviourinterface to the isgp namespace.

Added class comment to it.
Created a Gravity behaviour with some psuedo code for the actual gravity code.
player (not done yet)
Merge remote-tracking branch 'origin/bugfix' into prototype

Conflicts:
	ISGPKBS/Game/Game.vcxproj.filters
	ISGPKBS/Game/Level.cpp
	ISGPKBS/Game/Level.h
error fix
Merge remote-tracking branch 'origin/testing' into prototype
all my shizzle
Merge remote-tracking branch 'origin/testing' into prototype
Merge remote-tracking branch 'origin/testing' into gravity_9

Conflicts:
	ISGPKBS/Game/Game.vcxproj.filters
added a level factory interface
capitlized the T in translate
player can now move and jump
Merge branch 'prototype' into testing

Conflicts:
	ISGPKBS/Game/Game.vcxproj.filters
added a method to allow a translator to be idempotent
rename
Added a project called "UnitTests" to the solution.

Added a readme txt file with instructions for inclusion of game-code in the unit tests project.