removed trailing merge information
representation
Merge branch 'master' of github.com:sterlo/kineticWavelets