Retrieval of username and password
Updated Main
Merge remote-tracking branch 'origin/User-Interface'