styling
Merge branch 'master' of https://github.com/h55nick/Interviewr
more styling
resolved merge conflicts
resolved merge conflicts