created User class
resolved merge conflict, deleted everything from HEAD in favor of devise