starting to re-write login
Merge branch 'master' of github.com:L1fescape/LaunchHackathon2013