migrated CreateUsers and added timestamps
added ‘crypt’ gem, migrated db, updated model, added controller
added to controller & created several views
raked database & it modified schema
Merge branch 'master' into users_conflicts

Conflicts:
	config/routes.rb
	db/schema.rb
Merge pull request #4 from kwoodard22/users_conflicts

Users conflicts resolved