Revert "resolved compiler errors"

This reverts commit 49bf2c15ea3ee5bca0e1e9b0e6ebb5185eaf5a89.
Fixed image loading
Merge branch 'master' of github.com:bcasias/SoftwareFinal