crashing

SAme file
Merge branch 'master' of https://github.com/apelttom/TicketesBancos

Conflicts:
	main.cpp