A lot of needed updates!
Merge branch 'master' of https://github.com/LOZORD/binaria

Conflicts:
	advisor.rb
	game.rb