sync
Merge branch 'master' of https://github.com/alexjgriffith/peaks

Conflicts:
	src/python/peakBaseClass.py
Begining to work on new peak arangement method.