Login stuff
Merge branch 'master' of http://github.com/ih01/go_fish
login stuff