3rd travis fix
Merge branch 'master' of https://github.com/EmilS/OnlineJudge

Conflicts:
	.travis.yml