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

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