Merge branch 'master' of https://github.com/gsabatie/EpicJS

Conflicts:
	monster.h
2
3
4