Remove print
Upgrade to django 1.7, make migrations
asdf
Fixed merge conflicts