Beginning of storage

moved variables from popup to background, added functions for storage
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/popup.js