makefile
Merge pull request #2 from wjmelements/make

makefile