settings changes?
Merge branch 'master' of https://github.com/Somesingman/PennApps_Fall_2014

Conflicts:
	js/background.js
	js/popup.js
	manifest.json