no message
Merge branch 'master' of https://github.com/bgd54/Progverseny

Conflicts:
	binarydat/main.cpp