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
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
player can now move and jump
Merge branch 'prototype' into testing

Conflicts:
	ISGPKBS/Game/Game.vcxproj.filters