Merge branch 'type-align-mixin-duplication-fix' of...

Merge branch 'type-align-mixin-duplication-fix' of https://github.com/NikhilKalige/foundation into NikhilKalige-type-align-mixin-duplication-fix

Conflicts:
	scss/foundation/components/_type.scss