Just ignore this
Merge branch 'master' of https://github.com/pfryerda/Symbolize

Conflicts:
	web/js/common.js
	web/js/main.js
I hate git