Merge branch 'master' of https://github.com/AdamHjerpe/Pivot

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>

Conflicts:
	sass/mixins/_mini-mixins.scss
Merge branch 'master' of https://github.com/AdamHjerpe/Pivot

Signed-off-by: Adam Hjerpe <adam.hjerpe@hotmail.com>

Conflicts:
	sass/mixins/_mini-mixins.scss