Created new branch and changed settings to set up local environment
Added .gitignore and ignored directory that has design files in it
Created new database tables and gave sample data.  Made dump of these tables and data to be pushed up to GitHub for the others to use.
Got changes from GitHub so I can push to it
Updated settings.
Pulled in stuff from repo
Pulled in stuff from repo
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