qny37 commit
commit2
master commit2
Merge branch 'qny37'

Conflicts:
	README.md
Merge branch 'master' of github.com:BBTBoys/progit_qny37

Conflicts:
	README.md