Merge with front end
Merge branch 'master' of https://github.com/beta-plus/WebsiteMonitor