Merge pull request #27 from PurpleKangaroo/master

rules changes
Worked on RulesPanel
Merge pull request #295 from HoltMaki/master

rulespanel