setup
.
.
.
.
.
.
.
.
.
.
.
.
.
.
.
Merge branch 'master' of https://github.com/danielbradburry/profilepartners

Conflicts:
	images/test.jpg
.
Merge branch 'master' of https://github.com/danielbradburry/profilepartners
.