merge readme again
Merge branch 'master' of https://github.com/jaricftw/test

Conflicts:
	README.md

change to lily