Deleted a conflicting file
Merge branch 'master' of https://github.com/RubenAgudo/EHUSpaceInvaders.git