added new products and user favourites, modified user data to make it easier to log in
fixed typo rakefile
merged changes