test travis (again)
aaa
Merge remote-tracking branch 'origin/master'
travis configuration