storage-messup
Merge branch 'master' of https://github.com/mewwts/bandpage

Storage merge

Conflicts:
	storage.sql