<?php `git pull`; ?>
Merge remote-tracking branch 'origin/master'

Conflicts:
	editor/src/myApp.js