Merge branch 'master' of github.com:millesky87/Gamerproj into development
Merge branch 'master' of github.com:millesky87/Gamerproj into development
Merge branch 'master' of github.com:millesky87/Gamerproj into development
Merge branch 'master' of github.com:millesky87/Gamerproj into development
team commit
Merge pull request #25 from MC3D/master

merged branch 'master' into development branch
Merge pull request #26 from millesky87/style_update

few changes
git pull upstream master updates
Removes non-functional elements and styles
Merge pull request #27 from jgoley/j_go

Removes non-functional elements and styles
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
Adds show weapon on use functionality
Fixes show weapon for computer
Merge pull request #30 from jgoley/j_go

Adds show weapon on use functionality
audio change
final change