Add Microposts
Merge branch 'master' of github.com:Klopsch/finalproject
changed park description page
Merge branch 'master' of github.com:Klopsch/finalproject
Add microposts to park pages
Add microposts to park info
Merge branch 'master', remote-tracking branch 'origin' into lacoste
Fix merge
Fix for microposts
Merge branch 'master', remote-tracking branch 'origin' into lacoste
site formatting
Merge branch 'Alice'
Micropost fix and broken navbar
changed table width
aded base rspec things
Add View/Edit user link, fix for previous error with users
Merge branch 'Klopsch'
some styling changes
Merge branch 'master' of github.com:Klopsch/finalproject
test