Bug Fixes
Merge branch 'master' of https://github.com/SDP13-Team10/ClockAideDemo

Conflicts:
	DB.py
Resolved Conflicts