Merge pull request #1 from micromu/prova

add a new admin to settings.py
Merge branch 'master' of github.com:micromu/KanBanPy
prova di conflitto
resolve merge conflict
Merge pull request #2 from micromu/prova2

Prova2