Finalized app
Improved makefile