deleted .sass-cache
fixed conflict
updates
updates for edit gun owner
Merge pull request #21 from harveyenrile/edit_gun_license

Edit gun license