#42 Merged settings into one page
Merge branch 'master' of https://github.com/crunchersaspire/worshipsongs