Some restructuring and fixes
Merge conflict
Merge branch 'master' of https://github.com/mcmhav/muchbazar
Merge branch 'master' of https://github.com/mcmhav/muchbazar
Started rewriting experimental section and eval metrics
Merge branch 'master' of https://github.com/mcmhav/muchbazar
Some minor fixes
Merge branch 'master' of https://github.com/mcmhav/muchbazar
Started on discussion & conclusion