Conflicts:
	chrome/icons/icon16.psd
	chrome/icons/icon48-light.psd
	chrome/index.html
	chrome/screenshots/ScreenShotA.png
	chrome/screenshots/ScreenShotB.png
	chrome/style.css
	firefox/data/icons/icon-64.psd
	icons/icon128.gif
	icons/icon48.gif
	manifest.json