Merge branch 'travis' into dev

Conflicts:
	.travis.yml
Merge branch 'dev' of https://github.com/gabrielemariotti/cardslib into dev

Conflicts:
	.travis.yml