lets go father!
Merge remote-tracking branch 'origin/master'

Conflicts:
	puck.txt
	src/AIFriction.java
	src/AIManager.java
	utils/local-runner/result.txt