Changes to the main layout page
merge resolved
Merge branch 'layout'
Merge branch 'master' of https://github.com/Dan-Burnette/PingPongTournament