commit 1 by 1
commit 2 by 1
Merge branch 'master' of github.com:albertshen/workshop

Conflicts:
	index.php