created active record postgres stuff
Merge branch 'master' of https://github.com/fox-squirrels-2013/Thing-O-Marion

This merge is necessary because it just is