set up Devise and User model
welcome page
merged conflicts
t push origin masterMerge branch 'deedeelavinder-master'
merging conflicts
Merge pull request #9 from nickpassarella/master

DeeDee's pull request with conflicts merged