Merge pull request #59 from hipsterwannabe/dannyalxndr

Dannyalxndr
changed timer to show on page load
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
Merge pull request #60 from hipsterwannabe/dannyalxndr

cleaned up the add baby form
Merge pull request #61 from hipsterwannabe/greg

Greg
Trying to log times, still broken.
Merge pull request #62 from hipsterwannabe/dannyalxndr

sign up feature FINALLY works without errors!!
Trying to log times, still broken.
Merge branch 'ashwebb'

Conflicts:
	app/views/bottle.blade.php
About page edits
Adding icons to about page
Merge pull request #64 from hipsterwannabe/greg

Adding icons to about page
working on update baby info
Merge branch 'master' into dannyalxndr

* master:
  Adding icons to about page
  Trying to log times, still broken.
  Trying to log times, still broken.
  Copy change
  changed timer to show on page load