add new file, and change default grid
Merge branch 'master' of https://github.com/abstractadv/fondasiweb.git

Conflicts:
	src/scss/helper/_mixin.scss