added name field to users -- surprised I totally forgot about that before oh well lolz
add fields and migrations
added type column for STI
set up STI
added seeded data
resolved merge conflicts
replaced schema info
Remove unnecessary comment from Large Grant
Remove unnecessary comment from Small Grant
Removed app/models/user/ directory
Remove user_admins and user_recipients tables from schema
Remove unnecessary comment from Admin
Run migration to remove name from user
Destroy migration to add name to users
Remove unnecessary migrations so that devise migration could run
Add first name and last name field to User
Remove unnecessary comment in Recipient
Add firstname and lastname field to user.rb
Remove Erin from seed users
Merge branch 'master' into seeddata

Conflicts:
	app/models/large_grant.rb
	app/models/small_grant.rb
	db/schema.rb

Merge changes from master (Sam)