Conflicts:
	Makefile
	README.md