stuff changes
Changes
Merge pull request #2 from dmccraw/Jim

Changes
Merge pull request #1 from dmccraw/dustin

stuff changes
Groups Scaffolding
Merge pull request #3 from dmccraw/Jim

Groups Scaffolding
Add user model
Created membership model
Merge pull request #4 from dmccraw/matt

Created membership model
Merge pull request #5 from dmccraw/master

membership
Merge branch 'master' of https://github.com/dmccraw/class_economy into aaron
Merge branch 'devel' of https://github.com/dmccraw/class_economy into aaron