aconfee/TravisTest — pull request #7 by adamestela (2014-10-17 20:41:57+00:00)
Title: My feature

Conflict with master