Finished typing my webpage so nobody edit it.
Merge branch 'master' of https://github.com/alecbooth/Group-Website-Project