Added length to naps table
Added sample lengths to seeder
Began logic in Even Controller for graphs
Merge branch 'master' into greg

* master:
  Updating color variables.
  combined login/sign up into the same view
  Changing variables.
additional logic added to breast blade
Merge branch 'master' into greg

* master:
  added a Sign In navbar, fixed login form
  Fixing paths, styling.
  Moved user functions to new file 'UserController'.
  Added ability to update baby.
  Fixed navbar link overlap.
Changed config timezone to America/Chicago
Edited Event Controller to pass start and end times
Repositioned view.
Corrected indentation.
Changed calculation of nap length
Merge commit '04ffeed2f7a826eb6a233b28f86c8ed08c5410fc' into greg

* commit '04ffeed2f7a826eb6a233b28f86c8ed08c5410fc':
  Corrected indentation.
  Repositioned view.
Reformatted and positioned.
Merge branch 'dannyalxndr' of github.com:hipsterwannabe/babytracker into ashwebb
Merge pull request #54 from hipsterwannabe/dannyalxndr

working on sign up process.
Fixed graph view to graph nap time (need to convert to hours from minutes)
Merge pull request #55 from hipsterwannabe/greg

Adding nap graph
Repositioning.
New migration for feedings table
Merge pull request #57 from hipsterwannabe/greg

New migration for feedings table
Merge branch 'master' of github.com:hipsterwannabe/babytracker into ashwebb

Conflicts:
	app/views/bottle.blade.php
	app/views/breast.blade.php
fixed navbar issue, getting user reg finished
Positioning and changing button colors.