Moved around buttons and got rid of two of them: Cafeteria and Ads.
Merge branch 'master' of https://github.com/dsigmund89/Comp445-GUI-HardingApp