seven
eight
nine
ten
Merge branch 'seven' of github.com:ryansb/diplomamill.py into ryansb-seven

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

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

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

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