added user controller
removed registerable
added user fields
forgot to add file
Added presence validations
Updated seed with role
shortened validations
added cancancan
Merge branch 'master' into admin_screens

Conflicts:
	db/schema.rb
added users view and controller and bootstrap
added simple form and bootstrap layout
added form
First json API implementation
Merge branch 'admin_screens' of github.com:joshblour/quito-backend into admin_screens

Conflicts:
	config/routes.rb
added fields to user model
merged remote
added IntelliJ files to gitignore
fixed previous commit - files were not added
re-added fields to users
Merge branch 'admin_screens' of github.com:joshblour/quito-backend into admin_screens
merged remote