Merge branch 'master' of https://github.com/themestent/front-end-workflow

Conflicts:
	package.json
Merge remote-tracking branch 'origin/master'

Signed-off-by: Shajed Evan <evanshajed@gmail.com>

Conflicts:
	package.json