Merge branch 'gs-thumbnails' into develop
Merge branch 'rm-hackathon' into develop
Merge pull request #19 from FriendlyDesignCo/rm-hackathon

Rm hackathon
Swapped services images.
Merge branch 'develop' of https://github.com/FriendlyDesignCo/friendlysite into develop
Merge branch 'rsn-services-icons-swap' into develop

Conflicts:
	css/styles.scss
	index.html
Merge branch 'develop' of https://github.com/friendlyrick/friendlysite into develop
Extends to settins.scss made casestudy link style
Merge branch 'develop' of https://github.com/FriendlyDesignCo/friendlysite into develop
j,
Merge branch 'rm-hackathon' into develop

Conflicts:
	.sass-cache/129234f660c720a627dc824ba00e6d839e1b8e95/styles.scssc
Fixed problem

by changing button class and button hover class.
Merge branch 'rsn-button-hover-fix' into develop
Merge branch 'develop' of https://github.com/friendlyrick/friendlysite into develop
Outstanding commits
Limited max size
Ignore sass cache
Favicon Additions
Merge branch 'rsn-favicon-fix' into develop
Merge branch 'develop' of https://github.com/friendlyrick/friendlysite into develop