Continuing work on master's test 3
Fixed merge conflicts from travis2