Magic to fill the screen with our wonderful sight
Merge branch 'master' of https://github.com/NathanBland/softEng2013