untracked some files
untracked some more files
removed extraneous unmerged files
added andrew's code changes