updated to manifest version 2
updated readme
Merge remote-tracking branch 'thomasboyt/master'

Conflicts:
	Chrome/background.html