Removed hey.java
Merge branch 'test'

Conflicts:
	Test/src/hey.java
Merge branch 'master' of https://github.com/Joeslayer97/Joe-Lily