milliseconds shortened to display 2 digits
Merge conflict... wat :crying_cat_face:
Merge branch 'master' of https://github.com/mmcfadyen91/HackerWho