(fix) Merge conflicts
Merge pull request #74 from jgladch/feat/auth

(feat) Implement basic user auth flow