Welcome, bla
Fix travis script
Merge branch 'master' into bla

Conflicts:
	Makefile
Merge branch 'bla'