testing server commit without credentials
Merge branch 'master' of https://github.com/leovander/CorrelaterBackEnd
synatax and google login
fixing conflicts