Updated bright
Merge branch 'master' of github.com:shower/shower into keynote