wip
Merge branch 'master' of https://github.com/panghea/funkey

Conflicts:
	.travis.yml