Added code to handle city name option.
Merge branch 'master' of https://github.com/AshleighC/purplerain

Conflicts:
	background.js