more edits to graph blade
Merge branch 'master' into greg

* master:
  Added a logo and minor styling changes.
  Fixed links.
  Set up styling for future logo.
  Updated description and keywords.
  Removed h1.
  Made a return to menu link for about page, and add return to menu link in sidebar.
  Moved about button, added image.
added ceiling to graphs
continued work on graph blade
Merge branch 'master' of github.com:hipsterwannabe/babytracker

# By Ashley Webb (1) and Danny Jimenez (1)
# Via Ashley Webb (1) and Greg Vallejo (1)
* 'master' of github.com:hipsterwannabe/babytracker:
  Fixed incorrect name of image.
  edited the profile photos
Merge branch 'master' into greg

* master:
  continued work on graph blade
  Fixed incorrect name of image.
  edited the profile photos
  Fixed new user bug.

Conflicts:
	app/views/graphs.blade.php
Merge pull request #98 from hipsterwannabe/greg

Greg
Added Ashley's baby picture to about page.
Merge branch 'master' of github.com:hipsterwannabe/babytracker
Style changes and added new baby picture of Greg.
Added hr's and made columns the same height.
Added divs around graphs
still working with graph data
Merge branch 'master' of github.com:hipsterwannabe/babytracker

# By Ashley Webb
# Via Ashley Webb
* 'master' of github.com:hipsterwannabe/babytracker:
  Added hr's and made columns the same height.
  Style changes and added new baby picture of Greg.
  Added Ashley's baby picture to about page.
Merge branch 'master' into greg

* master:
  still working with graph data
  Added hr's and made columns the same height.
  Style changes and added new baby picture of Greg.
  Added Ashley's baby picture to about page.
Merge pull request #99 from hipsterwannabe/greg

Greg
added about us pictures
Merge branch 'master' of github.com:hipsterwannabe/babytracker

# By Greg Vallejo (5) and Ashley Webb (3)
# Via Greg Vallejo (8) and Ashley Webb (1)
* 'master' of github.com:hipsterwannabe/babytracker:
  still working with graph data
  Added divs around graphs
  Added hr's and made columns the same height.
  Style changes and added new baby picture of Greg.
  Added Ashley's baby picture to about page.
  continued work on graph blade
  added ceiling to graphs
  more edits to graph blade

Conflicts:
	app/views/about.blade.php