Signed-off-by: serengeor <serengeor@gmail.com>
Merge branch 'game_objects' of https://github.com/serengeor/And-they-shall-know-no-fear into game_objects

Conflicts:
	Sources/tile_map.cpp
	Sources/tile_map.h
asked for it..

Signed-off-by: serengeor <serengeor@gmail.com>