First experiment in merging our code

Hi Nick,

I just added to the gemfile, created a states table, created the state model, and populated the seed file. Just want to make sure that you're able to merge my changes with your origin master, before doing anything else.

Christine