Added license info
Merge branch 'master' of https://github.com/puffball/puffball