test
Merge branch 'master' of github.com:regoo/slycat

Conflicts:
	.gitignore