hey
Merge branch 'master' of https://github.com/jeremykainostraining/Hello.git
Merge branch 'master' of https://github.com/jeremykainostraining/Hello.git
fixed SOMEWHAT
hello
Merge branch 'master' of
https://github.com/jeremykainostraining/Hello.git

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