camera
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
cam
main(added camera to diaply)
Fixed out-of bounds error on collisionMap

Also indixing collisionMap works as intended
FAKKING MAP.TXT
Merge branch 'Sebastian'

Conflicts:
	grief/grief/map.txt
meh.
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
omg! map.txt faaaak
ignore igen
camera
Editor works with view
camera fix
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Changes to bump map collision

Kim can now be resized, still not perfect.
Merge branch 'Sebastian'

Conflicts:
	grief/grief/map.txt
camera delay
Merge remote-tracking branch 'origin'

Conflicts:
	grief/grief/Display.cpp
map.txt
fk