Jumbo front page text
Merge branch 'master' of https://github.com/JJMcConnell/Software-Engineering-Project
Fixed the dumbest merge conflict possible