Merge branch 'master' into issue-#5
issue-#5

finish authentication logic, signup still needed but pushed back.
Merge branch 'issue-#5'