Initial version of a Makefile
Merge branch 'makefile'