deleted the app environment from this repository
Merge branch 'master' into dannyalxndr

* master:
  Added mock data for baby gender and birth date.
  Removed birth weight columns.
  Added birth weight columns.
  Added gender and birth_date columns.
  Removed mock data for nap_start and nap_end columns.
  Removed start and end columns.
  Adding development environment
  Added a new view route to show after new user is created.
  Created page to route to after a new user is created.
  app environment
  Created newUser function.
  Added blade form to create a new user.
  Added post route for creating a new user.
  Added index route, and fixed formatting.

Conflicts:
	babytracker/config.xml
	babytracker/plugins/org.apache.cordova.console/.fetch.json
	babytracker/plugins/org.apache.cordova.device/.fetch.json
	babytracker/www/js/controllers.js
	babytracker/www/templates/tabs.html
Merge branch 'master' into dannyalxndr

* master:
  Added new table.
Merge branch 'master' into dannyalxndr

* master:
  Added id and baby_id->unsigned() to event tables.
  Added foreign key to weights table.
  Added foreign key to lengths table.
  Added foreign key to circums table.
  Added circum table.
  Created circumference model.
  Created Length model.
  Created Weight model and deleted babytracker app files.
master, css, img, js files initial commit
Merge branch 'dannyalxndr'
commiting to resolve conflict