My test work
Merge branch 'master' of github.com:IDeaFlux/test

Conflicts:
	yohani.php
Changed to workplace.xml
Testing for commit