example js-git create
Merge branch 'master' of https://github.com/ostb/ostb

Conflicts:
	server.js