SIGN IN SIGN UP

- fix merge conflict

D
doko@ubuntu.com committed
72f61de768dc17ad528e1b3c01a87998eff22cac
Parent: 2273ab2