two
Merge branch 'master' of github.com:msoucy/diplomamill.py

Conflicts:
	x.py