testing new setup
testing new setup.py 2
testing new setup.py 2
Merge branch 'master' of https://github.com/dotKom/feedme
iFail
Merge branch 'master' into dev

Conflicts:
	feedme/forms.py
	feedme/models.py
	feedme/views.py
	setup.py