fixed migration error with devise
added basic attributes to user table
resolved merge conflict in models