added gitignore
cleanup ignore files
modified gitignore
added a git note
modified utf8
added more utf8
modified gitnote
deleted books
added books
Merge branch 'master' of github.com:winsphinx/MyDesktop

Conflicts:
	days.txt
	python/ftp.py
	vinote.txt
	无线固话.txt
modified ftp.py
added books
deleted books
deleted books
added wifiguard
modified
Merge branch 'master' of github.com:winsphinx/MyDesktop
deleted books
deleted xls
modified files