Reformatted and positioned.
working on sign up process.
Merge branch 'dannyalxndr' of github.com:hipsterwannabe/babytracker into ashwebb
Merge pull request #54 from hipsterwannabe/dannyalxndr

working on sign up process.
Merge pull request #55 from hipsterwannabe/greg

Adding nap graph
Repositioning.
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.
Merge pull request #58 from hipsterwannabe/greg

began logic in event controller to graph feedings, more work needed
fixed login, sign up is still buggy
Merge commit 'c5744d5e1a6d758c93230c01489e25695d4797c0' into dannyalxndr

* commit 'c5744d5e1a6d758c93230c01489e25695d4797c0':
  began logic in event controller to graph feedings, more work needed
  Positioning and changing button colors.
  New migration for feedings table
  Repositioning.
  Fixed graph view to graph nap time (need to convert to hours from minutes)
  Reformatted and positioned.
  Changed calculation of nap length
  Corrected indentation.
  Repositioned view.
  Changed config timezone to America/Chicago Edited Event Controller to pass start and end times
  additional logic added to breast blade
  Added length to naps table Added sample lengths to seeder Began logic in Even Controller for graphs

Conflicts:
	app/views/child-menu.blade.php
Merge pull request #59 from hipsterwannabe/dannyalxndr

Dannyalxndr
Copy change
Merge branch 'master' into greg

* master:
  Copy change
  fixed login, sign up is still buggy
  Positioning and changing button colors.
  fixed navbar issue, getting user reg finished
  Repositioning.
  working on sign up process.
  Reformatted and positioned.

Conflicts:
	app/views/bottle.blade.php
	app/views/breast.blade.php