Change a docstring in plasma.py.
Merge branch 'master' of https://github.com/calypsoh13/miscScripts

Conflicts:
	plasma.py
Synching with Kat's changes

Merging