updates

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>
Merge branch 'master' of https://github.com/thomfoolery/fb

Signed-off-by: Thomas Yuill <thomas.yuill@gmail.com>

Conflicts:
	js/main.js