wizzardLizzardGizzard
mergerMerge branch 'master' of github.com:GrayOverride/McMocup

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:GrayOverride/McMocup
branch