Changed my-subproject from parent
Changed things in both parent and subproject
Merge pull request #1 from EchoLiao/vinny-some-awesome-work

Vinny some awesome work