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

Conflicts:
	x.py
Merge branch 'ryansb-five'
Merge branch 'six' of github.com:ryansb/diplomamill.py into ryansb-six

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