fixing styling
resolve merge conflicts
Merge branch 'master' of https://github.com/jaeros/firearm_listing