Project scaffolding
Merge branch 'master' of github.com:ambitioninc/django-issue

Conflicts:
	.gitignore