set up travis
Merge branch 'master' of github.com:peter-gerhard/sphere-playground

Conflicts:
	.travis.yml