simplified bubble stuff
Merge branch 'master' of http://github.com/crockct/6830project