Frank tests
Merge branch 'master' of github.com:hbohlmann/Converter_Objc

Conflicts:
	Makefile