first commit
changed code in sub
made a change directly on sub
added a new file
merging updates from sub