adds user model and controller
Edits show and index for Users
Changes user show page a bit
Changes to schema
Merge branch 'publicactivity'

Conflicts:
	config/routes.rb
	db/schema.rb
Merge branch 'publicactivity'

Conflicts:
	config/routes.rb
	db/schema.rb