committing before pull
Merge branch 'template' of github.com:hipsterwannabe/babytracker into greg

# By Ashley Webb
# Via Ashley Webb
* 'template' of github.com:hipsterwannabe/babytracker: (25 commits)
  Deleted old master and renamed dummy. Called master in all files that extend views.
  Add baby is formatted and writes to database.
  Changed submit buttons to be orange.
  Update growth stats form is formatted and logging correctly to the database.
  Nap view formatted and logging correctly.
  Bottle logs correct times, was missing hidden inputs.
  Breast is formatted and logs everything correctly.
  Bottle is formatted and writes to database, but doesn't log time correctly.
  Corrected indentation.
  Looks good and writes to database.
  Added links to buttons.
  Removed sidebar.
  Changed max image size.
  Added missing moment.js, timer works in bottle.blade now.
  Timer not working.
  Deleted old file.
  Added link, removed sub menu.
  Fixed tab id's to toggle each profile view.
  Combine child menu and update child into one view.
  Corrected indentation.
  ...

Conflicts:
	app/views/layouts/master.blade.php
Merge branch 'master' into template

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

Template
Added margin-left to fix alignment issue with the timer.
Changed background color from beige to gray.
View no longer needed, form shows in menu.
Merge pull request #77 from hipsterwannabe/ashwebb

Deleted unnecessary view.
Merge branch 'dannyalxndr'
Merge branch 'master' of github.com:hipsterwannabe/babytracker

# By Ashley Webb
# Via Ashley Webb
* 'master' of github.com:hipsterwannabe/babytracker:
  View no longer needed, form shows in menu.
  Changed background color from beige to gray.
  Added margin-left to fix alignment issue with the timer.

Conflicts:
	app/views/layouts/master.blade.php
Merge branch 'master' into greg

* master:
  View no longer needed, form shows in menu.
  working on button styling
  Changed background color from beige to gray.
  Added margin-left to fix alignment issue with the timer.
  testing for bugs, added my about paragraph

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

Greg