Message please
Merge branch 'master' of https://github.com/jaantti/Firestarter

Conflicts:
	cpp/main.cpp