update
Merge branch 'master' of github.com:buendiya/mysite

Conflicts:
	db.sqlite3
	garment/admin.py
	garment/static/garment.js
version 1