fixed
Merge branch 'master' of https://github.com/jeremykainostraining/Hello
Merge branch 'master' of https://github.com/jeremykainostraining/Hello

Conflicts:
	bin/employee_stuff/Consultant.class
Merge branch 'master' of https://github.com/jeremykainostraining/Hello
hello