Merge branches 'dev' and 'master' of https://github.com/gabrielemariotti/cardslib into dev2
Applied Travis CI