fx
Merge branch 'master' of github.com:jagermesh/bright

Conflicts:
	js/bright.min.js