login protection
Merge branch 'master' of github.com:Numero7/Marmotte