Initial commit
Added colon near username and password labels
Merged hello.xhtml files

Conflicts:
	alka-website/src/main/webapp/pages/hello.xhtml