fixed conflicts
added url link to all view pages for users
fixed conflicts
added will-paginate gem to work on pagination
added will-paginate gem
Merge pull request #11 from crystalperreira/kathy

Kathy