added the folder for factories
modifications to the schema
updated controller files and spec files
wrote the basic crud methods for users
created views for users index, show, new, edit, and form partial
git remaining files to complete merge, no local changes made
merging changes
changes to get current