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

Conflicts:
	README.md
readme
readme
Merge pull request #3 from Lawliet-L/q

Q