updated everything
rules
Merge branch 'GGMethos-master'