deleted .sass-cache
fixed conflict
updates
updates for edit gun owner
Merge branch 'edit_gun_license' of https://github.com/harveyenrile/gunlicense into edit_gun_license
Merge pull request #30 from harveyenrile/edit_gun_license

Edit gun license