aaa, bbb
Merge branch 'master' of git://192.168.77.121/MyOtherRepo

Conflicts:
	code/index.php
index3.php modified
code added
--- waah
Merge branch 'code'