changed button on nap blade to log times and change color
completed nap blade logic
Merge branch 'greg': bottom-script section added on master
Merge branch 'master' of github.com:hipsterwannabe/babytracker

# By Ashley Webb (6) and Danny Jimenez (2)
# Via Greg Vallejo (4) and Danny Jimenez (1)
* 'master' of github.com:hipsterwannabe/babytracker:
  added forms for the add child view
  Was going to add select child menu, but needs to be in master.blade.
  Added id parameter to diaper functions. Figuring out how to get baby_id.
  Added Form open and close.
  Added id parameter to diaper route.
  Created file EventController and added container around diaper content.
  Added new child route and replaced diaper routes.
  created the add child view and linked that view with the add child button in the home screen.

Conflicts:
	app/views/layouts/master.blade.php
Merge pull request #26 from hipsterwannabe/greg

Nap blade
Merge branch 'master' of github.com:hipsterwannabe/babytracker into ashwebb

Conflicts:
	app/views/layouts/master.blade.php