local branch test commit
commit mothefucker
another commit mothefucker
another commit mothefucker
Merge branch 'local'

Conflicts:
	index.php