new db
Merge remote-tracking branch 'origin/Kevin's-branch' into TingYu'sBranch
Merge remote-tracking branch 'origin/master' into TingYu'sBranch

Conflicts:
	db.sqlite3
now
now2
11
db
db
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3