first commit
proper first commit
another commit
commit without 2nd line
first commit to newbranch
big fix
Merge branch 'newbranch'

Conflicts:
	tmp.php
Merge branch 'master' of github.com:englishvoodoo/projects