set up Devise and User model
welcome page
merged conflicts
t push origin masterMerge branch 'deedeelavinder-master'
merging conflicts