initial commit
Merge branch 'master' of github.com:NiklasRosenstein/nas

Conflicts:
	README.md