Victor Work
Merge branch 'master' of https://github.com/vlchen91/example

Conflicts:
	readme.txt