3 clusters!
Merge branch 'master' of https://github.com/zrathustra/math119-spr-2014

Conflicts:
	linear_lattice.py