mob + reste
arrow
object + arrow + crystal
Merge branch 'objects'

Conflicts:
	arrow.cpp
	arrow.cpp~
	arrow.hpp
	arrow.hpp~
	character.hpp~
	game.cpp
	game.cpp~
	game.o
	npc.cpp
	npc.cpp~
	npc.o
	object.cpp
	object.cpp~
	object.hpp
	object.hpp~
	playable_char.o
	rpg
mob + objets