Version Echo
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Bromagatchi/jump.java
Merge remote-tracking branch 'origin/master'
Version Echo