Updated Makefile
Merge branch 'master' of https://github.com/zschoche/mlog

Conflicts:
	CMakeLists.txt