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

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

Conflicts:
	main/forms.py
	main/views.py
Merge pull request #15 from zfirlus/master

master