test commit after add travis
Merge branch 'master' of github.com:torphan11/wptest
merge master