Parallax
Merge branch 'Sebastian'

Conflicts:
	grief/grief/grief.vcxproj.filters
FIX!
yes
Merge branch 'master' of https://github.com/adeadrat/Grief
FK PARALLACKS
derp