changed makefile
edit makefile
Merge branch 'master' of https://github.com/bloodyfool-info/logs

Conflicts:
	Makefile