code refactoring
Merge branch 'master' of https://github.com/abiaco/Assessment-IGGI
more bug fixing
fixing merge
fixed danage text bug
solved merge conflicts
more merge conflicts