git pull upstream master updates
Merge branch 'master' of github.com:millesky87/Gamerproj into development
adds players/s names to the home page
Merge pull request #28 from MC3D/development

adds player's names to the home page; changes when image changes
Adds functionality to weapon buttons
Merge pull request #29 from jgoley/j_go

Adds functionality to weapon buttons