ignore ds store
Merge branch 'beta-wip' of github.com:adampatterson/Tentacle into beta-wip

Conflicts:
	.gitignore