committing files to temp branch
fixed route for skus. not sure why i had to add all of these other files. apparently they were in .gitignore so just added them. they can be removed if need be. I don't suspect it will affect anything.
fixed merge conflicts.