Created/routed to baby Timeline and also fixed /family path in navbar.
Merge pull request #13 from kshimatsu/timeline

Created/routed to baby Timeline and also fixed /family path in navbar.
Embedded Letter form into Timeline. Reroutes to BACK.
Edited Timeline to include Letter form
Deleted spacing in controllers
merging from pull Merge branch 'master' into timeline
Implementing CarrierWave to upload one image at a time to Timeline. Some HTML changes to Timeline.
Edited the photo upload code
Image thumbnails on Timeline will be cropped and displayed as squared
Changed edit path on Timeline for Baby's Announcement.
Changed Photo Params in PhotosController for added security for current_user
Merge pull request #14 from kshimatsu/timeline

Deleted spacing
Edit/Delete buttons on Letters hide and show on mouse hover. Fixed Edit Letter path back to Timeline.
Added Timeline.js file which allows for hover delete/edit for letters
Merge pull request #16 from kshimatsu/timeline

Added Timeline.js file for edit/delete hover on letters
nav bar styling
Merge pull request #17 from jasonwhlaw/navbar_enhancement

nav bar styling
Fixing merge conflicts