commit
Merge branch 'master' of https://github.com/Baloche/ns

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
commit
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns
Merge branch 'master' of https://github.com/Baloche/ns