added login. Greg disapproves.
Merge branch 'master' of https://github.com/schordas/Jata
things got fucked up
Merge branch 'master' of https://github.com/schordas/Jata
merge for some reason