problemy z views.py
Merge branch 'master' of https://github.com/karolb/filmiarnia

Conflicts:
	serwis/views.py
	serwis/views.py~
Naprawienie views.py