Second commit
Login actually works
Merge remote-tracking branch 'Spontaneity/master'