Merge branch 'iter1' of https://github.com/CS169-Virtual-Fitting-Room/VirtualFittingRoom into iter1

Conflicts:
db.sqlite3
skip this one 2