test3
Merge branch 'master' of https://github.com/manugit/gfm

Conflicts:
	actions.php