Fixed bad merge
Fixed bad merge
acant/gitdocs,DustinH/gitdocs,Ammar12/testapp,acant/gitdocs,nesquena/gitdocs,nesquena/gitdocs,Ammar12/testapp,DustinH/gitdocs,acant/gitdocs,DustinH/gitdocs,nesquena/gitdocs