updates to activator (timer fixes)
Merge branch 'master' of https://github.com/dmb2bt/CS3240-Group-19