nunit test
Merge branch 'master' of https://github.com/koshmel/TravisTest

Conflicts:
	.travis.yml