Fixed Merge Duplicate CSS
Merge branch 'master' of https://github.com/Edyt/pattern-library

Conflicts:
	font-style.css
	icon-archive/style.css