Proj setup

Edited project setup to allow compiling of both apps solely based on the makefile.