ch changes
Merge pull request #74 from CodePath-MAF/login_first

ch changes