rules modified again
Merge branch 'master' of https://github.com/Daisuki91/FamilyTree.git
change code organization