views stubbed
Fixed merge conflicts
Got rid of extra files in master
Working on the timer for the quiz
Merge branch 'dev' of https://github.com/strivedi183/interviewr into dev
Merge branch 'master' of https://github.com/strivedi183/interviewr into dev
Trying out the javascript timer
Merge branch 'dev' of https://github.com/strivedi183/interviewr into dev
Merge branch 'dev' of https://github.com/strivedi183/interviewr into dev
Merge branch 'dev' of https://github.com/strivedi183/interviewr into dev
Attempts on a timer
Last minute changes
Merge branch 'dev' of https://github.com/strivedi183/interviewr into dev
Added edit client and edit stylist