add in different read and parsing in restart
seems really buggy now
Merge branch 'master' of https://github.com/chelseah/CORE

Conflicts:
	sf.cpp