added a new line
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rps.cpp
fix conflict
Merge pull request #1 from azaka/master

added a new line