watchdog commit
Merge branch 'master' of https://github.com/kmwhelan93/CS3240