made isInPhase one member variable of step for correct next prev, updated .gitignore
Merge branch 'master' of https://github.com/hskaw/WIFE

Conflicts:
	coffee-script/simplex.coffee