Didnt know I had changes

apparently some things
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/Main.java