fixed mapping
fix conflict
Changed size of f main background and fixed top menu bar
Merged top menu
ddd
Merge branch 'iter3' of https://github.com/CS169-Virtual-Fitting-Room/VirtualFittingRoom into iter3
fixed search button
Merge branch 'iter3' of https://github.com/CS169-Virtual-Fitting-Room/VirtualFittingRoom into iter3

Conflicts:
	db.sqlite3
Fixed menu bar bug
Fixed menu bar bug
Added DB
Merge branch 'iter3' of https://github.com/CS169-Virtual-Fitting-Room/VirtualFittingRoom.git into iter3
my changes
fixed my mistake
delete db
Merge branch 'iter3' of https://github.com/CS169-Virtual-Fitting-Room/VirtualFittingRoom into iter3
Populated db
alert to dialog
Merge remote-tracking branch 'origin/iter3' into iter3