SIGN IN SIGN UP

resolve conflicts from main merge

O
Oskar Wickström committed
a605ff4ed14176d5a886053db1812fd029e50149