Merge pull request #1 from calblueprint/gitignore

gitignore
added model
Merge pull request #2 from calblueprint/user_model

added model users
Merge pull request #3 from calblueprint/cleanup

Cleanup
Deleted user model
Update Gemfile
Added devise to gem file
Created user model with devise
Migrate grants.
Create SmallGrant and LargeGrant.
Initialize rspec.
Merge pull request #4 from calblueprint/grants

Grants
Added admin to user model
Merge pull request #5 from calblueprint/setup-rspec

Initialize rspec.
Added recipients to user model
Update Gemfile
Resolved conflicts
Resolved gemfile conflict
Merge pull request #7 from calblueprint/UserDevice

User device
Merge branch 'update-gemfile'

Conflicts:
	Gemfile.lock