Missing commit files

Conflicts:

	Makefile