deleted .sass-cache
fixed conflict
updates
updates for edit gun owner
Merge pull request #23 from vincentpaca/master

Show correct stats
Merge pull request #24 from vincentpaca/master

Add expired licenses
Merge pull request #25 from vincentpaca/master

Show gun owner map on single view
Merge pull request #26 from vincentpaca/master

Show marker info
Merge pull request #27 from vincentpaca/master

Show unmapped addresses
Merge pull request #28 from vincentpaca/master

Paginate some shit. We're not savages, you know.
Merge pull request #29 from vincentpaca/master

Add SMS capability
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
Add sessions
Removed sessions
Added auth methods
Namespace up in this bitch. Use proper namespace to separate dashboards
Added owner namespace