Initial commit
Merge branch 'master' of https://github.com/ltfschoen/flowers
Merge pull request #1 from ltfschoen/master

Fix merge