fixed merge conflicts and started to create contact layout
Merge pull request #4 from brain-murphy/brian-branch

fixed merge conflicts and started to create contact layout