merged conflicts
Merge branch 'master' of https://github.com/thorbenk/ia13project
Add classification
Merge branch 'master' of https://github.com/thorbenk/ia13project