transform start
save
Merge branch 'master' of git://github.com/burner/sweet.hpp

Conflicts:
	parallelalgo.hpp
merge
Merge branch 'master' of git://github.com/burner/sweet.hpp

Conflicts:
	Makefile
	conv.hpp
	parallelalgo.hpp
options work
some more