splash screen still
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.xml
Merge branch 'master' of https://github.com/Jshauk/solvesAll
error fix