Teste Gabi
Merge branch 'master' of https://github.com/nikopolides/thelastworldwar

Conflicts:
	biblioteca.cpp
	game.cpp