merge dev to master
i am master
merge 16:11
Merge branch 'dev'
Merge branch 'dev'
fixd the bug issue-101
Merge branch 'master' of https://github.com/epooren/learngit

Conflicts:
	test.txt