Initial Commit
Merge branch 'master' of ssh://github.com/hillst/AmpliShare

Conflicts:
	README.md