Nonplayable elements
Merge branch 'master' of https://github.com/grakidov/rapgj

Conflicts:
	source/player.cpp