update
Log
Merge branch 'master' of github.com:quaffle97/pd1-wookierepellent-vorobyev-tsui

Conflicts:
	Log.md
	jellyworld/MyPoint.java
	jellyworld/World.java
Merging pains
merge