+ travis
Merge branch 'master' of github.com:eddyxu/cpp-coveralls

Conflicts:
	README.md