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
Working on ajax form
Schema changes.
Merge branch 'master' of github.com:schmitzt3/yugen

Conflicts:
	.gitignore
	docroot/sites/default/settings.php