first commit
Merge branch 'master' of https://github.com/fenfenxu/PhonegapDemo

Conflicts:
	.gitignore
add