changed login.html
Merge branch 'master' of https://github.com/thai90/testgit

Conflicts:
	login.html