Changes
Merge branch 'master' of https://github.com/johnolos/classify

Merging with alterations in ClassifyManually.java