Setup
Merge branch 'master' of https://github.com/horiajurcut/quantum-app

Conflicts:
	requirements.txt