removed atom, added ajfgit, removed k
merged