Utbyggnad av display

Knapparna förbättrats
knapparna
1
camera fix
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Merge branch 'Sebastian'

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

Conflicts:
	grief/grief/Display.cpp
IGNORE FAKKING MAP!!!
2
a wild platform
Merge branch 'master' of https://github.com/adeadrat/Grief
added toolbar
platform
Merge branch 'Sebastian'

Conflicts:
	grief/grief/grief.vcxproj.filters
	grief/grief/map.txt
fk
Merge branch 'master' of https://github.com/adeadrat/Grief
Fixes
toolbar
Merge branch 'Anton'

Conflicts:
	grief/grief/Display.cpp
	grief/grief/grief.vcxproj
	grief/grief/main.cpp
	grief/grief/map.txt