Fixes #8
Merge branch 'feature/HackathonMerge' of https://github.com/fohtoh/siteMonitor into feature/HackathonMerge