initial commit.
Merge branch 'master' of https://github.com/arleighdickerson/salvo

Conflicts:
	.gitignore
	README.md