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

Conflicts:
	Level/Level.map
	Sources/editor.cpp
Load or save a map.

Signed-off-by: NeverSeen <neverseenone@gmail.com>