Firefly v1.0
Merge branch 'master' of https://github.com/cakesmith/Firefly

Initial merge of Firefly v1.0