fixing the merge problems
Merge pull request #3 from otondin/bullets

Bullets