Guihelp update
animation states player
aa
Merge branch 'master' of https://github.com/adeadrat/Grief

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

Conflicts:
	grief/grief/Player.cpp
mergeconflict
Merge branch 'master' of https://github.com/adeadrat/Grief
aa
fx
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/Player.cpp
sf::clock
Merge branch 'master' of https://github.com/adeadrat/Grief

Conflicts:
	grief/grief/Player.cpp
working!
platformsprite
Merge branch 'master' into Sebastian
Updated buttons
Merge branch 'master' into Anton

Conflicts:
	grief/grief/map.txt
platform
animationsStates