added note
minor change
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rps.cpp
fix conflict