Update view 2
update view 3
Merge branch 'master' of https://github.com/CaoManhDat/smartmusic

Conflicts:
	db.sqlite3
	smartmusic/models.py