NC joining
Merge branch 'master' of https://github.com/swajud/WRSA
try10

Merge branch 'master' of https://github.com/swajud/WRSA

Conflicts:
	.gitignore