added more before merge
merge conflict
Merge branch 'master' of https://github.com/mmcfadyen91/Front-EndDevInterviews