added buttons to step through results
fixed merge conflict in index.js