just changed 1 line in application.js to include kirsten's keyboard.js
fixed merge conflicts
fixed merge conflicts
fixed bar chart so it actually shows time per topic
Merge pull request #36 from rory2988/fixbarcharttimer

fixed bar chart so it actually shows time per topic
topics in visualization are now in correct order
Merge pull request #37 from rory2988/ordertopicsbytimecreated

topics in visualization are now in correct order
fixed some css
Merge pull request #38 from kevinmcalear/css_stuff

fixed some css
tracking journey on show page