azer
Merge branch 'master' of https://github.com/bumblebeez/rush-rpg-lol-

Conflicts:
	epic_game/begin.c
	epic_game/begin.o
	epic_game/fonc/hero.c
	epic_game/fonc/hero.o
	epic_game/fonc/monster.c
	epic_game/fonc/monster.o
	epic_game/fonc/room.c
	epic_game/fonc/room.o
	epic_game/read_file/type.c
	epic_game/read_file/type.o
	epic_game/server