progress-annulus
Switched to reactive FLUX
Merge branch 'master' of github.com:metrofun/me.telefile.www

Conflicts:
	public/index.js
	public/main.css