added login ability
fixed merge