test merge (to see if travis-ci is hooked up)