Should force a frame to display when steve stops being lazy and
implements his part :p
Should make a frame display when steve's done his part
Merge branch 'master' of https://github.com/NLSteveO/CS3716-Project.git