bloop
Merge branch 'master' of https://github.com/brndnthai/plantivity
Login works but does not redirect
Resolved conflicts