jh - added timer library to /lib folder.
Beginning to update Makefile for library, forgot to pull updates from master
Merge branch 'master' into LargeMatrix

Pulling updates to lib directory into LargeMatrix