Changed Makefile and fitness function in simulator
Merge branch 'davidlaptop'