added to .gitignore
Merge branch 'hidalgo' of github.com:christiannaths/designbattle
updated Gemfile.lock
hides crud links when viewing other users weapons
added nav link to layout for weapons
getting back to work