added login to index
merged chagnes