cmake
cmake
Merge branch 'cmake' of https://github.com/rsyh93/castleofthedungeon

Conflicts:
	Makefile.Linux
	src/main.cpp