Add user model with devise
add prelim rdoc & seed data.
Merge pull request #1 from maebeale/master

add prelim rdoc & seed data.
Merge branch 'master' of https://github.com/dazm12/yardbook
Add users controller, remove turbolinks references
Add users_controller tests and index method
merge spec file conflicts.
Merge pull request #2 from maebeale/master

merge spec file conflicts.
add welcome index to routes
removed the welcome route
Add role, remove is_admin
merged with upstream/master
Adjust seeds to reflect STI changes
Solved merge conflict with user_controller_spec
generate welcome controller. change welcome index to html only. set root route to welcome#index
merge STI and factories changes.
Add active_model_serializer gem, for users
Merge pull request #3 from maebeale/master

add welcome index. change views files & folders. began carrier wave uploader.
Add admin and student controller, serializer, and spec
carrierwave setup