Signed-off-by: GameOwen <gameowencz@gmail.com>
Merge branch 'master' of https://github.com/wondermac/Task8-Repo.git

Conflicts:
	WebContent/welcome.jsp