adding kmeans
Merge branch 'gh-pages' of github.com:cs109/2014 into gh-pages
fixing merge