added matt's coloring
smooth new wave mixing
changed some variable names
starting to c++ify code
wipe out sfml library and just use plain glx