focus on elementso
Merge branch 'master' of github.com:MitHack/SubChrome

Conflicts:
	app/scripts/controllers/main.js