Travis
Merge branch 'master' of github.com:Corvidian/Kandi

Conflicts:
	.travis.yml