change order of vars so that calculations work
Merge pull request #4 from bobvoorneveld/gh-pages

change order of vars in wavetrack so that calculations work