Register page + login lines added
Merge remote-tracking branch 'origin/master'

Conflicts:
	WT Mini Project/WebContent/login.html