fixed problem
more changes
Sign in and out COMPLETE
Merge pull request #14 from davisengeler/michael-dev

Pull from michael-dev