ah
Merge branch 'master' of https://github.com/adeadrat/Grief
Merge branch 'master' of https://github.com/adeadrat/Grief
byggfix
Merge branch 'master' of https://github.com/adeadrat/Grief
Merge branch 'Anton'
Merge branch 'master' of https://github.com/adeadrat/Grief
new changes to guihelp and display
Alot of shit!
map.txt
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/map.txt
Merge branch 'master' into Anton

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

Conflicts:
	grief/grief/map.txt
Antoooooooon!
Small fixes to make program compile.
Also small changes to Sprite.
Joystick (xbox controll)
Joystick (xbox controller)
Create README.md