ubuntu add content
change from windows 7
Merge branch 'ubuntu'

Conflicts:
	README.md
change to original