Refactoring
Merge branch 'new_trunk' of https://github.com/darkbasil/21_game into new_trunk