Database Changes
Merge branch 'master' of https://github.com/beta-plus/WebsiteMonitor

Conflicts:
	web/data/database.sql