Add merge action, to handle hooking merges
Merge branch 'master' of https://github.com/PabloVallejo/post-forking into PabloVallejo-master

Conflicts:
	includes/merge.php