Including theOtherY and theOtherPhiStar variables for Nicole's unfolding.
Tidying up after inclusion of Nicole's variables.
Fixing the fixes; namely the tab issues, which will hopefully look right this time...
Merge pull request #1 from alexeyfinkel/master

Pull Request adding Nicole's extra variables.