Scaffolding
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/database.yml
	config/routes.rb
	db/schema.rb
Merge branch 'master' of http://github.com/nicolasUribeV/RPSProject