mas
mod add
del old mod add new
Merge branch 'newBranch' of ssh://git@github.com/Opiant/opientTest.git
into newBranch

Conflicts:
	client/user.html
	server/app.js
	server/controller.js
	server/model.js