Began altering buttons
merge conflictMerge branch 'master' of https://github.com/camcross/p45_project