new commit
new Branch

New branch test
Local changes
Local files added
Merge branch 'pdm'

Conflicts:
	.idea/dataSources.xml
	.idea/workspace.xml
	mJuke/models.py
Local commit
Merge branch 'master' of https://github.com/kwistbac/mJuke