working on active user
Merge branch 'master' of https://github.com/dkellis42/RPS_App
validating commenting
Merge branch 'master' of https://github.com/dkellis42/RPS_App

Conflicts:
	server.rb
post-mockathon rps