Commit _before_ deploy, dummy
Merge branch 'master' of github.com:marxian/roboinge

Conflicts:
	.travis.yml