Added .DS_Store to ignored files
Changed header of file
Changed location of root file
Changed location of root file
Merge