changed to my name
Merge branch 'master' of https://github.com/kfwong/smarttrolley

Conflicts:
	README.md