fixed entire project
Fixing merge conflict
Merge branch 'master' of https://github.com/mmcfadyen91/HackerWho