deleted .sass-cache
fixed conflict
updates
Merge pull request #20 from vincentpaca/master

Some fixes
updates for edit gun owner
Merge pull request #21 from harveyenrile/edit_gun_license

Edit gun license
Fix gun owner update method to use strong parameters
Fix typo causing blank serial numbers