modified:   goodold/config.cfg
	modified:   goodold/core.py
	modified:   goodold/core.pyc
	modified:   goodold/test_01.py
	new file:   goodnew/__init__.py
	new file:   goodnew/core/__init__.py
	new file:   goodnew/core/__init__.pyc
	new file:   goodnew/core/mseed.py
	new file:   goodnew/core/mseed.pyc
	new file:   goodnew/seeds/20140914_150235.seed
	renamed:    data/E -> goodnew/seeds/E
	renamed:    data/N -> goodnew/seeds/N
	renamed:    data/Z -> goodnew/seeds/Z
	new file:   goodnew/settings.ini
	new file:   goodnew/test_01.py
	new file:   goodnew/test_01.pyc
Merge branch 'master' of https://github.com/damiencross/Seismo

Conflicts:
	goodold/core.pyc
	goodold/test_01.py