Cleaned up merge conflicts from git pull upstream master and reverted simon_says_spec.rb