local storage
Merge remote-tracking branch 'origin/master'

Conflicts:
	uploadImage.html