First pass at bubbles
Merge branch 'master' of https://github.com/zparmley/YH11

Conflicts:
	whale.js