final
Merge branch 'master' of https://github.com/goingpaper/project

Conflicts:
	project/project.sqlite3
Merge branch 'master' of https://github.com/goingpaper/project

because