what did i change
fix conflict
fix conflict again
trying jsfeat
trying to reduce points
still reducing points
reduce points and time
Merge branch 'master' into gh-pages