Update welcome message
Remove welcome message
Merge branch 'testing'

Conflicts:
	init.el