Added database settings
form calculations module
uao function added to calculation module
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
stoped following settings
Working on ajax form
test
Schema changes.
Merge branch 'master' of github.com:schmitzt3/yugen

Conflicts:
	.gitignore
	docroot/sites/default/settings.php
need to pull from repo for updated database
Merge branch 'alex-branch' of github.com:schmitzt3/yugen into trevor-branch
Merge branch 'master' of github.com:schmitzt3/yugen into alex-branch

Conflicts:
	docroot/sites/default/settings.php

got updated database.  commiting added files to update database and settings so this damn thing shuts the fuck up
Updated settings
Got calculations from folder from Dustin
Merge branch 'dustin-branch' of github.com:schmitzt3/yugen into trevor-branch

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