Added ads information to ad/show page
wired up the show page with no user info
Fixed conflicts
merged show ad page
fixed conflicts
Merge pull request #15 from eduardopoleo/master

Fixed issues