what?!
i am tired
~~~
Merge remote-tracking branch 'origin/kitty' into good

Conflicts:
	HelloEmily/src/Hello.java
oh yah
okay
Olaf
counting kangaroo
Merge remote-tracking branch 'origin/star' into merged
Merge remote-tracking branch 'origin/merged' into CountingStar

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.projects/HelloEmily/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/HelloEmily/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/692224723.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt