incoming merge conflict
incoming merge conflict
Merge branch 'master' of https://github.com/mmcfadyen91/HackerWho

attempting to merge

Conflicts:
	index.html
	styles/styles.scss