blah
hello
Merge branch 'master' of https://github.com/mewwts/bandpage

Conflicts:
	storage.sql
merge smerge
Merge branch 'master' of https://github.com/mewwts/bandpage
this file obv. should be committed
storage modified. not sure if this is right. might have to revert