Deleted original users migration
Deleted original users migration
database setup
Resolved conflicts in devise_users_migration
Updated search_controller
Fixed Sign Up form
Updated sign up
Merge pull request #2 from theponti/development

Development