makefile
merge with master
make
deleted files
merge master
Merge pull request #2 from lukkm/makefile

Makefile