Commit from lt
Merge branch 'master' of https://github.com/eruns/com-sheddaquarium-blu

Conflicts:
	js/blu.js