first commit
end of night 1
ds-store

ds-store
vsrgf

asfgaw
@!
!!
fix conflict
deded
some bitty
trimmed some data