Merge branch 'master' of...

Merge branch 'master' of https://gitlab.cs.ui.ac.id/pmpl/class-project/marjinal-digipus into 1706979360-105

 Conflicts:
	app/tests.py
	app/urls.py