Merge branch 'master' of https://github.com/RajatBhageria/Waywo

Conflicts:
	login.html