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
added base template
... bootstrap<3
moved base.html cuz why not
correct static url referencing
added isntructions for standalone
removed old instructions for ow4
Merge pull request #8 from dotKom/dev

unfucked partially complete stuff and stashes