login 1st attemp
merged
add a comma
Merge branch 'master' into login

merge with new master
start social login feature
Merge branch 'master' of github.com:CMUSV-SmartReader/SmartReader