w

test5
test6

test6test6test6
test7

test7 test7
Merge branch 'master' of https://github.com/resoft/c_MVC

Conflicts:
	test.txt