ran into some git trouble, initial commit again
git trouble, merging remote so git is happy