add spray_gun
add sin_gun
Merge branch 'master' of github.com:vkd/Ctrl-Space