On branch master
Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   1-first-homework/Test.txt
Merge branch 'master' of github.com:stuycs-apcs-z/hw
 On branch master
 Your branch is ahead of 'origin/master' by 2 commits.
   (use "git push" to publish your local commits)

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   1-greeter/Test.txt
Merge branch 'master' of github.com:stuycs-apcs-z/hw