-- readme fix from conflicts
-- travis build file
--
Merge branch 'dev' of github.com:zafarella/caao into dev