modified:   exercises/src/main/scala/fpinscala/errorhandling/Option.scala
    Changed filter.  This is behind what is on github.  So a pull should
    change it.
Merge branch 'master' of https://github.com/ntedeschi/fpinscala

Conflicts:
	exercises/src/main/scala/fpinscala/errorhandling/Option.scala
modified:   exercises/src/main/scala/fpinscala/errorhandling/Option.scala
    Fixed merge conflicts.