Updated Login Layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	dev/login.html
Peeved Coding