Commiting the whole lot
Merge branch 'master' of github.com:fginter/fish-feeder