made a change
made other changes
made other changes
add chan
finished the test
Merge branch 'testing'
master commit
Conflicts:
	test.html
fix bug
fix
fix
dsf
dsf
Merge branch 'iss1'
just a test
just