Added timer
modified makefile
added timers
merged