initial commit
deleted dup of spectrum
removed ds store
merge conflicts