Added Files in the gitignore
Reindented code and fixed sign up phone number thing
Fixed conflicts