minor changes
Merge branch 'master' of https://github.com/JustinSainton/Flower.org-Theme
Merging changes.