removed unecessary files and updated Makefile.
Merge branch 'master' of https://github.com/OSAC/ObuntuApps