some todos
Merge branch 'master' of github.com:byorgey/thesis

Conflicts:
	equality.lhs