Merge pull request #32 from stevenaweiss/master

trying to fix login controls, and merge conflicts
PJ help with login.  it works
user can create an account
login and sign up controls working and display appropriately
login logout show and hide. YEAH