coding...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/com/github/tanacasino/nnp/NNP10.scala