3 domača naloga.
Merge remote-tracking branch 'ipri/master'

Conflicts:
	database.db
	main/static/css/style.css
	main/templates/404.html
	main/templates/main/home.html
	main/templates/main/profile.html
	users/views.py