Edit local changes before merge.
Merge branch 'master' of github.com:LmntStudio/karbonit-player

Conflicts:
	LICENSE.md