update problem with buttons not showing due to screen resolution
Merge branch 'master' of https://github.com/ScofieldB/Group4