commit local
commit update
ah!
Merge branch 'master' of https://github.com/RadSys/RadSysNM

Conflicts:
	.gitignore