changes to the resources
Merge branch 'master' of https://github.com/Dig-Doug/EC327-Project

Conflicts:

Beep/bin/classes/com/beep_boop/Beep/startScreen/StartLevelActivity.class