add parallax scrolling, start adding info bubbles
merge