.
Merge branch 'master' of https://github.com/igmoweb/Founderscores

Conflicts:
	scss/style.scss