committing forgotten files and pn2 project
Merge branch 'master' of https://github.com/thequbit/mc911feedwatcher

Conflicts:
	src/mcsafetyfeed-server/mcsafetyfeedserver/static/feed.html