updated Makefile
branch for running real cases on cpu
Merge branch 'master' into yalaa