updated HossLogin.xib
merging with remote repository
updated HossViewController
merging changes
updated HossViewController
committing before pulling from GitHub
updated user state
updated user state (again)
Merge remote-tracking branch 'origin/master'
merged from remote repository