Tuesday morning Kyle
Merge branch 'master' of github.com:kyle-dorman/crowdcontrol

updating from monday night"