lil change
Merge branch 'master' of https://github.com/alexeevdv/falltergeist

Conflicts:
	src/States/LocationState.cpp
lil change