Addition of NNMF and k-means
Merge remote-tracking branch 'refs/remotes/origin/master'