modify
Merge branch 'master' of github.com:cjlabalan/training

Conflicts:
	index.php