untrack run.py
Merge branch 'master' of https://github.com/kajun/peptide_tools

Conflicts:
	run.py