Added my settings.
Removed individual settings
Create README.txt
Added test module, front page template, and style
Merged trevor-branch
Got changes from GitHub so I can push to it
Merge branch 'master' of github.com:schmitzt3/yugen
Updated settings.
Pulled in stuff from repo
Pulled in stuff from repo
Update settings.php
Merge branch 'alex-branch'
Merge branch 'alex-branch'

Just testing
Merge branch 'alex-branch'

fixed issue with gitignore
Diet plans SQL and data added.