Added log-in prototype
Merge remote-tracking branch 'origin/uploadbranch'