commiting some working code compile stuff
deleting old makefile
Merge branch 'master' of https://github.com/ebel/cplusplusmagic