Update settings.php
Adding .gitignore
Merge branch 'master' of github.com:schmitzt3/yugen into trevor-branch

Conflicts:
	.gitignore
Merge branch 'trevor-branch' of github.com:schmitzt3/yugen into trevor-branch

Conflicts:
	docroot/sites/default/settings.php
Creating ajax form
.gitignore won't be followed
Merge branch 'alex-branch'

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

fixed issue with gitignore
Working on ajax form
Merge branch 'master' of https://github.com/schmitzt3/yugen into dustin-branch
Schema changes.
Merge branch 'master' of github.com:schmitzt3/yugen

Conflicts:
	.gitignore
	docroot/sites/default/settings.php
merge into my branch