Merge pull request #1 from JasonCanCode/active-record

Active record
Merge pull request #2 from JasonCanCode/master

Merge pull request #2 from JasonCanCode/active-record