logowanie
base
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/static/base.html
base
logowanie
base
base
base
Merge remote-tracking branch 'origin/master'

Conflicts:
	main/static/base.html
	main/views.py
base
Merge pull request #11 from zfirlus/master

master