dumb commit
Merge branch 'master' of https://github.com/marooned071/ProjektZespolowy

Conflicts:
	django/pz/db.sqlite3
	django/pz/qrpolls/templates/qrpolls/index.html
	django/pz/qrpolls/templates/qrpolls/meeting.html
	django/pz/qrpolls/views.py
ostateczny refact 2