commit data
Merge remote-tracking branch 'origin/master'

Conflicts:
	webpage/data.db
owners can authenticate users