initial commit

Test project for andrew godwin for circular dependency issues with
migrations
Merge branch 'master' of https://github.com/gabejackson/django-migration-testproject

Conflicts:
	.gitignore