Merge branch 'master', remote-tracking branch 'origin' into lacoste
Merge remote-tracking branch 'origin' into lacoste
microposts
no microposts
footer and table format
Merge branch 'master' of github.com:Klopsch/finalproject
Merge branch 'Klopsch'
Merge branch 'master', remote-tracking branch 'origin' into lacoste
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
Fix merge