commit to merge
Merge branch 'master' of https://github.com/nighelles/Waves
Merge branch 'master' of https://github.com/nighelles/Waves
Merge branch 'master' of https://github.com/nighelles/Waves
minor fixes.
uhg
ugh, merge, git is whack
Merge branch 'master' of https://github.com/nighelles/Waves
Merge branch 'master' of https://github.com/nighelles/Waves
Merge branch 'master' of https://github.com/nighelles/Waves
Merge branch 'master' of https://github.com/nighelles/Waves