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

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

Conflicts:
	grief/grief/map.txt
Merge branch 'Sebastian'
animation
Merge branch 'Sebastian'
...
Merge branch 'master' of https://github.com/adeadrat/Grief
player
Fixed parallax
Merge branch 'master' into Anton

Conflicts:
	grief/grief/Player.cpp
	grief/grief/map.txt
commit
Empty
Empty
Merge branch 'Anton'

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

Conflicts:
	grief/grief/map.txt
Little math helper
Merge branch 'master' into Sebastian
Mathhelper + better recttorect