alright, should be fixed now.

Had a problem with some corrupted files, everything should be ok now.
Merge branch 'master' of https://github.com/noahemiller/rapidfont

Conflicts:
	fontBuilder.ufo/lib.plist