Conflict
Revert "Conflict"

This reverts commit 1a4cd9b539551a986bb2c871ee9510ab523021bd.
Revert "Error if duplicate user or email on registration."

This reverts commit b74fbad5ee2932e2c86e209b324eaae4bebcf4ad.
Revert "Reports now show answers for an individual user and links from the reports index."

This reverts commit 54f79c4b686470a3c1c7e5fa9e60fa9f9c5ff454.
Revert "Revert "Reports now show answers for an individual user and links from the reports index.""

This reverts commit 8f19ff32c4677a08c5b7de3409ce2b878bbfe2d7.
Revert "Revert "Error if duplicate user or email on registration.""

This reverts commit d088f24079708b24e9ce1806528e558e5509654e.
Revert "Revert "Conflict""

This reverts commit 4ec8ea032c54a9474e1a084babdaf27b01e8df60.
Revert "Conflict"

This reverts commit 1a4cd9b539551a986bb2c871ee9510ab523021bd.
init
Updated the Gemfile for postgre
Simply duplicating the last version.
Edited welcome screen.Again.Again.
Merge branch 'master' of https://github.com/MikeLampkin/UoSGeo