working on it
Merge peter->master
Merge branch 'peter'
New bullets
New texture