minor changes
some small changes
resolving conflict
added bubbles paralax