Clean up and fix code formatting to conform with team req
Merge branch 'master' of
https://github.com/samirouahhabi/teamAYICTriviaMaze.git