modified:   code_count.py
modified:   linux_command.txt
modified:   state.txt
Merge branch 'master' of github.com:wang2453/codes

Conflicts:
	state.txt