edits
Merge branch 'theme'
.gitignore is now working
test
Merge branch 'master' of https://github.com/niekdegreef/business