made some variables final
Merge branch 'master' of https://github.com/Team293/UglyBetty