tuff
Merge branch 'master' of github.com:nabobalis/pyvmd

Conflicts:
	VMD.py