Added analytics and two rules
WIP
Merged master
Merged master
Merge pull request #51 from BYUI-Web/dtm

Dtm