DESCRIPTION EDITS
Merge branch 'master' of github.com:geneva/AFLPtools

Conflicts:
	DESCRIPTION