Config

Added devise and other gems.
Edited forms.
Created user database.
Fixed merging errors.