fixed version conflict
fixed version conflict
Merge origin/master
worked on AarfWriter. wrote most of the functionality