Merge pull request #1 from Lawliet-L/q

update
hi
Merge pull request #2 from Lawliet-L/woodpoetry

hi
q
Merge branch 'master' of github.com:Lawliet-L/smartphone into q

Conflicts:
	README.md