Added devise gem and working user authentication
small changes
fixed conflict
updated readme