added user auth
added TODO to gitignore
Fixed merge conflict in TODO