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