delete 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	delete.php
Merge branch 'master' of https://github.com/kevinstadelmann/Go2Row

Conflicts:
	delete.php