fixed repository clashes; removed sub-directory git structure
Pulling master into master