Added stuff on official rules
Merge branch 'master' into gh-pages
Added rules