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

Conflicts:
	grief/grief/main.cpp
Vettefan
Merge branch 'Sebastian'

Conflicts:
	grief/grief/Player.cpp
player
utökat display
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/main.cpp
	grief/grief/map.txt
whoooooops
camera
fk Anton
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
Utbyggnad av display

Knapparna förbättrats
knapparna