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

Conflicts:
	db.sqlite3
Update