fixed views
Merge branch 'master' of github.com:nishi13/pj25

Conflicts:
	sistema/views.py
add logo POlijr