new branch kitty
Merge remote-tracking branch 'origin/kitty' into good

Conflicts:
	HelloEmily/src/Hello.java
oh yah
okay