Merge pull request #2 from JasonCanCode/active-record

Active record