Merge pull request #31 from Lakon/master

dev merge
Merge pull request #9 from MikePaNtZ/development

Development
Added gun sprite
Merge pull request #32 from Daikatana/master

Added gun sprite
Merge pull request #19 from MikePaNtZ/development

Development