Merge pull request #13 from kshimatsu/timeline

Created/routed to baby Timeline and also fixed /family path in navbar.
merging from pull Merge branch 'master' into timeline
Implementing CarrierWave to upload one image at a time to Timeline. Some HTML changes to Timeline.