setting stuff up
conflict resolution
makin changes
Merge pull request #29 from nairys/stats

Stats