STORY #15: adjustment login 1
STORY #15: Merge remote