Updated cat button
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team5
Updated navigation bar
Updated nav bar
Merge pull request #41 from csrobinson86/master

Updated application layout
created the gameover page
updated merge conflicts
Merge pull request #42 from CTFigueroa/master

Created the game over page and updated merge conflict from pulling previous version.
merged conflict errors