buy and sell not done
Merge branch 'master' of https://github.com/wondermac/Task7-Repo.git

Conflicts:
	WebContent/template-section-navigation-emp.jsp