First time in git...
Merge branch 'master' of github.com:adybbroe/pyspectral

Conflicts:
	README.md