commiting my timer additions
some additions to makefile