Changed config a bit.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/config.yml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed data saving and importing and stuff. Woo!