updated
Merge branch 'master' of github.com:kmmurphy88/packerpro
simple formatting
Merge pull request #5 from cwcarlson10/phase-2

simple formatting
fixed confict
updated links
Merge pull request #6 from NMVO/links

Links
Made some changes:
  - Pulled Nick's changes to edit and show page
  - Made changes to packlists controller to have it show up all changes to list
  - Made some changes to the Packlist model.
inserted nav-bar
Merge pull request #7 from cwcarlson10/nav-bar

inserted nav-bar
changed css