Testing simpler login form
Merge branch 'master' of github.com:vikram01/skydrivetexty

Conflicts:
	index.html
Fixed botched merge