asldkfj
Merging in my model changes. don't forget to syncdb