Merge branch 'master' of https://github.com/JoyP/trailer-love into login
google login
Merge branch 'master' into login
Merge branch 'login'