Add /* no break */ in main.cpp
typo hotfix "Mashine" -> "Machine"
Merge branch 'master' of https://github.com/mwuttke97/turisimi

Conflicts:
	Help.cpp