update parser and ad formater
Merge branch 'master' of https://github.com/ConnerHaffner/471hw2b