Conflicts: html/General/Settings-section-Rice.html Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle IDColor conflicts between Mayhem's repo and ours
Conflicts: html/General/Settings-section-Rice.html Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle IDColor conflicts between Mayhem's repo and ours