Replace author name + resolve conflict#159
Open
samanehmaboudi wants to merge 3 commits intoemmacharp:masterfrom
Open
Replace author name + resolve conflict#159samanehmaboudi wants to merge 3 commits intoemmacharp:masterfrom
samanehmaboudi wants to merge 3 commits intoemmacharp:masterfrom
