plot stuff
Merge branch 'master' of github.com:gareth-cross/pumadance
changed some things
Merge branch 'master' of github.com:gareth-cross/pumadance
added blend times
Merge branch 'master' of github.com:gareth-cross/pumadance
any changes