first commit, new repo, several folders
added another file
Merge remote-tracking branch 'exercise1/master'