asd
add test
change
bug
add text to module 2
update
Merge branch 'master' of git://github.com/izumiogino/module_test

Conflicts:
	module_2.txt
	module_3.txt