images conflict
Merge branch 'master' of https://github.com/sreiss/piratemining.git
Merge branch 'master' of https://github.com/sreiss/piratemining.git
Merge branch 'master' of https://github.com/sreiss/piratemining.git
Merge branch 'master' of https://github.com/sreiss/piratemining.git
changing icon size