add content
update on windows 7
add newline
add newline
Merge branch 'ubuntu'

Conflicts:
	README.md
restore
admin change
ubuntu change
change
good
Merge branch 'ubuntu'
add test