password reset done! changed overall structure so settings.py will be tracked from now on.
it's fine.
Merge branch 'master' of github.com:LucilleH/ssuns-2014