12/16/13 commit

Added shooting, still needs to be fixed