merge code
semi-working
Merge branch 'master' of https://github.com/MitulP91/andrew-madden-game