using makefile
Merge branch 'master' of https://github.com/korczis/peacemaker

Conflicts:
	.travis.yml