more refactoring
l
Merge remote-tracking branch 'origin/master'

Conflicts:
	LifeOnLine/bin/lol/LOLGui.class
Merge branch 'master' of https://github.com/cs2103-t10-1j/main