parser combinators
Merge branch 'master' of git://github.com/edofic/scala-phpSerData into edofic-master

Conflicts:
	README.md