object parsing basics
Merge branch 'master' of github.com:phantasien/pbxproj

Conflicts:
	Makefile