first commit
merge master
update authentication