Merge pull request #19 from knnyluk/master

fixed merge conflict for branch 'Bfinity-messagebug'
added bunny assets