Initial commit, basic POC working
continute to test
Merge branch 'master' of github.com:jasonmanners/salmon

Conflicts:
	.gitignore