backing local stuff up
Merge branch 'master' of https://github.com/sg84/loginbox