committing in the middle of changes to pull updates
Merge branch 'master' of github.com:LadyNorm/rps
Merge branch 'master' of github.com:LadyNorm/rps