Diet plans SQL and data added.
Merge branch 'alex-branch' of github.com:schmitzt3/yugen into trevor-branch
Updated settings
Merge branch 'dustin-branch' of github.com:schmitzt3/yugen into trevor-branch

Conflicts:
	docroot/sites/default/settings.php
Updated settings
Updated diet form
update dustin branch