merging
Merge branch 'eric_restructure' of https://github.com/QBRC/PIPE-CLIP into eric_restructure

Conflicts:
	pipeclip.py