Blah lens-1.8 aaah
Merge branch 'master' of https://github.com/Taneb/family-tree

Conflicts:
	family-tree.cabal
	src/Data/FamilyTree.hs