aaaaah
merge it
Merge branch 'master' of https://github.com/mewwts/bandpage

Conflicts:
	storage.sql
Added eye-candy to the lyrics view
blash
Merge branch 'master' of https://github.com/mewwts/bandpage
we be fesking aka merging