first drafts
Merge branch 'master' of https://github.com/freps/fidget

Conflicts:
	app/Fidget.js