Added stuff
Resolved conflicts
Merge pull request #26 from nairys/ActiveRecordstuff

Active recordstuff