Almost all done
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/KernMe/Levels/LevelsView.java
return font size