Merge pull request #4 from projectcs13/develop

Develop
Merge pull request #11 from projectcs13/develop

Develop
Finish sign in failure
Fix conflicts