first commit
first commit
Merge branch 'master' of https://github.com/cowenberg/snap

Conflicts:
	ghost_project/feedbacks/views.py