Merge commit '91102c4cf61106386f4a32b1ac27d49ffc11ab42'
Added a file to the main and sub folder
Merge pull request #2 from Radioguy00/wip

Wip
Removed and added one file in the subproject
Create subfile4.cpp
Squashed 'sub/' changes from 4d27234..995a354

995a354 Create subfile4.cpp

git-subtree-dir: sub
git-subtree-split: 995a354bd486557a94fe8f1701536cb0944db41c
Merge commit '00c05ffeaad2360f92e7080c58fb54932a378226'
Merge commit '00c05ffeaad2360f92e7080c58fb54932a378226'
Merge commit '995a354bd486557a94fe8f1701536cb0944db41c'
Merge pull request #3 from Radioguy00/wip

wip and master are merged
Merge commit '973fcb992efd99888cdfdad52368078a1fd045c8'