This is a test of github.
This Makefile works on Alex Dombos's MAC
Merge branch 'master' into dombos (removed Makefile, test)

Conflicts:
	Makefile.in