Added diet columns to Users table. exported it. also added settings.php to gitignore
Merge branch 'alex-branch'