Shitty merge
Merge branch 'master' of github.com:SimonRichardson/binoculars

Conflicts:
	binoculars/lenses.go
	binoculars/partial-lenses.go
	example.go