Edit Demo.java
dedede
dfdaf
Merge branch 'master' of https://github.com/berniejiang/demo.git

Conflicts:
	src/com/demo/Demo.java