Formatting and fixing zooming inside things
Merge branch 'master' of https://github.com/tarunnurat/UIUCHack

Conflicts:
	fb/obj-module.js
Hopefully fixed things...