Added diet columns to Users table. exported it. also added settings.php to gitignore
Update settings.php
Merge branch 'alex-branch'
.gitignore won't be followed
Merge branch 'alex-branch'

Just testing
fixing gitignore issue
Merge branch 'alex-branch'

fixed issue with gitignore
Schema changes.
Diet plans SQL and data added.
Merge branch 'master' of github.com:schmitzt3/yugen

Conflicts:
	.gitignore
	docroot/sites/default/settings.php
Merge branch 'alex-branch' of github.com:schmitzt3/yugen into trevor-branch
Updated settings