supplies mostly done
Merge branch 'master' of https://github.com/MaritalWheat/homebase
Merge branch 'master' of https://github.com/MaritalWheat/homebase
Merge branch 'master' of https://github.com/MaritalWheat/homebase into finish