added clear_state/merged login with create_user'
Merge branch 'master' of https://github.com/clarkds/6858-final-project