Salt theoretically done
Merge branch 'master' into Login
asdf
Merge pull request #16 from kmblake/Login

Login