Update rockpaperMVC.py

Fixed issues with non-branching commits to merge manually