ignored settings
smergge
Merge branch 'master' of github.com:mewwts/helgapp
just fixing some users
merge

Merge branch 'master' of github.com:mewwts/helgapp