Merge pull request #21 from Sara-lily/master

updated final screen
minor changes to game logic
Conflicts resolved
Merge pull request #22 from otorres86/master

minor game logic changes
Updated final pages
Hopefully this works
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #23 from otorres86/master

final version
things