Merge pull request #16 from reekoheek/master

controller should merge data to response instead of replacing it
update license
Merge branch 'master' of github.com:reekoheek/bono