resolve conflicts
Merge pull request #9 from jdegoes/ready/update-deps

update dependencies (patch fix)
Updated readme.
Merge branch 'master' of github.com:purescript-contrib/purescript-lens into split

Conflicts:
	bower.json