created basic skeleton and able to shorgun homepage
merged user.rb and README
change user to models file
merged Carter's files into skeleton
remove duplicate file
Delete .DS_Store
resolved conflicts