three
Merge branch 'three' of github.com:ryansb/diplomamill.py into ryansb-three

Conflicts:
	x.py
Merge branch 'ryansb-three'