travis yml
Merge branch 'master' of github.com:friggit/friggit