change placeholder to "username"
Merge branch 'master' of git@github.com:wgychris/Task7.git

Conflicts:
	MutualFund/WebContent/WEB-INF/c_login.jsp
Merge branch 'master' of git@github.com:wgychris/Task7.git