Adding less.
Merge branch 'master' of github.com:hipsterwannabe/babytracker
Merge pull request #49 from hipsterwannabe/greg

Greg
Changing variables.
Merge branch 'master' of github.com:hipsterwannabe/babytracker into ashwebb
combined login/sign up into the same view
Merge branch 'master' into dannyalxndr

* master:
  Changing variables.
  Corrected Event Controller Created route in master blade
  Adding less.
  Timer button classes changed
Updating color variables.
Merge pull request #50 from hipsterwannabe/dannyalxndr

combined sign in/up views into one
Added length to naps table
Added sample lengths to seeder
Began logic in Even Controller for graphs
Merge pull request #51 from hipsterwannabe/ashwebb

Updating color variables.
Merge branch 'master' into greg

* master:
  Updating color variables.
  combined login/sign up into the same view
  Changing variables.
Fixed navbar link overlap.
additional logic added to breast blade
Added ability to update baby.
Moved user functions to new file 'UserController'.
Fixing paths, styling.
added a Sign In navbar, fixed login form
Merge branch 'master' into dannyalxndr

* master:
  Fixed navbar link overlap.
  Updating color variables.

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

Dannyalxndr