commit before merging
Merge branch 'master' of https://github.com/vicli/critiqueit

Conflicts:
	js/control_bar.js