level, ai fix
Merge remote-tracking branch 'refs/remotes/origin/test' into test

Conflicts:
	src/app/Physic.java
+opt