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

Conflicts:
	Makefile