Changed child project from parent
Changing things in both parent and subproject
Removed useless files
Merge commit '5dc1a6aaae1d4f8cf71d8d118302b1c33d1edb5a'

We need this to pull the last update from original part.
EDITED FILE2
UPDATING THE FILE 2
Merge commit '08333ede2390c21c005f78d6331392c7c0414498'