added chartjs
fixed merge erros, added chartjs
Merge branch 'master' of https://github.com/h55nick/Interviewr
fix merge conflict