initial commit
Merge branch 'master' of github.com:tesera/tractor-beam

Conflicts:
	.gitignore