Cleaned-up and automated makefile

Conflicts:
	README
	Tests/main.c
	makefile