made a change
hotfix change
test.tc add
Merge branch 'testing'

Conflicts:
	test.rb
?????????????
rerere
Merge branch 'testing'
Merge branch 'master' of https://github.com/lynnjch/Layer1_git_repository