Merge pull request #1 from vivekmshah/vivek

user and equipment models (no relation)
Merge pull request #2 from vivekmshah/vivek

user and equipment controllers
show user
Merge pull request #3 from vivekmshah/paul

show user
equipment controller and view basics
Merge pull request #4 from vivekmshah/james

equipment controller and view basics
authentication
Merge pull request #5 from vivekmshah/paul

authentication
add rspec
Merge pull request #6 from vivekmshah/james

add rspec
add first batch of tests (that don't pass)
tests are failing at this point
Merge pull request #7 from vivekmshah/james

James
equipment tests
Merge pull request #8 from vivekmshah/paul

equipment tests
Pluralize tables in data model diagram
Merge branch 'master' of https://github.com/vivekmshah/moochify
a few minor syntax changes
Merge pull request #9 from vivekmshah/james

a few minor syntax changes
Associate user to equipment in create controller action