login update
Merge branch 'master' of https://github.com/varoon-fang/soidav

Conflicts:
	.DS_Store