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

Conflicts:
	grief/grief/map.txt
cam
main(added camera to diaply)
FAKKING MAP.TXT
Merge branch 'Sebastian'

Conflicts:
	grief/grief/map.txt